Author: gnichols
Date: 2009-12-22 17:55:48 +0000 (Tue, 22 Dec 2009)
New Revision: 267
Modified:
trunk/Makefile
Log:
484657 - hts uses code deprecated in python 2.6
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-12-21 20:18:22 UTC (rev 266)
+++ trunk/Makefile 2009-12-22 17:55:48 UTC (rev 267)
@@ -18,13 +18,14 @@
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE :=
svn+ssh://svn.fedorahosted.org/svn/v7
+V7_RHEL_VERSION := 5
.PHONY: clean install
SUBDIRS := test-env v7 tests docs
all:
- for i in $(SUBDIRS); do $(MAKE) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) -C
$$i; done
+ for i in $(SUBDIRS); do $(MAKE) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE)
V7_RHEL_VERSION=$(V7_RHEL_VERSION) -C $$i; done
install-noarch: install
@@ -36,12 +37,13 @@
@echo "# $(V7_VERSION_PY) is automatically-generated - DO NOT EDIT" >>
$(V7_VERSION_PY)
@echo "version = '$(V7_VERSION)'" >> $(V7_VERSION_PY)
@echo "release = '$(V7_RELEASE)'" >> $(V7_VERSION_PY)
+ @echo "rhel_version = '$(V7_RHEL_VERSION)'" >> $(V7_VERSION_PY)
install: mark-version
mkdir -p $(DESTDIR)/usr/share/v7
mkdir -p $(DESTDIR)/var/v7
mkdir -p $(DESTDIR)/var/v7/docs
- for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION)
V7_RELEASE=$(V7_RELEASE) install; done
+ for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION)
V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done
clean:
$(MAKE) -C tests clean
@@ -52,10 +54,10 @@
rm -f v7.spec.el4
$(MAKE) -C docs clean
-package: install v7-$(V7_VERSION_RELEASE).tar.bz2
+package: install v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2
-v7-$(V7_VERSION_RELEASE).tar.bz2: /tmp/v7/exclude v7.spec
+v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec
tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ *
@@ -70,12 +72,13 @@
echo "*.bz2" >> $@
v7.spec: v7.spec.in Makefile
- cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e
's/@V7_RELEASE@/$(V7_RELEASE)/g' > $@
+ cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e
's/@V7_RELEASE@/$(V7_RELEASE)/g' -e
's/@V7_RHEL_VERSION@/$(V7_RHEL_VERSION)/g'> $@
srpm: package
- rpmbuild -ts v7-$(V7_VERSION_RELEASE).tar.bz2
+ rpmbuild -ts v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2
rpm: package
- rpmbuild -tb v7-$(V7_VERSION_RELEASE).tar.bz2
+ rpmbuild -tb v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2
+