Author: gnichols Date: 2010-01-27 11:58:02 +0000 (Wed, 27 Jan 2010) New Revision: 338
Added: tags/v7-V1-1R4/ tags/v7-V1-1R4/Makefile Removed: tags/v7-V1-1R4/Makefile Modified: tags/v7-V1-1R4/v7/version.py Log: tag version
Copied: tags/v7-V1-1R4 (from rev 335, trunk)
Deleted: tags/v7-V1-1R4/Makefile =================================================================== --- trunk/Makefile 2010-01-27 11:43:50 UTC (rev 335) +++ tags/v7-V1-1R4/Makefile 2010-01-27 11:58:02 UTC (rev 338) @@ -1,95 +0,0 @@ -# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material -# is made available to anyone wishing to use, modify, copy, or -# redistribute it subject to the terms and conditions of the GNU General -# Public License v.2. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Author: Greg Nichols - -V7_VERSION := 1.1 -V7_RELEASE := 3 -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 - -HERE=$(shell pwd) - -HERE=$(shell pwd) - -HERE=$(shell pwd) - -.PHONY: clean install - -SUBDIRS := test-env v7 tests docs - -all: - 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 - -tag: mark-version - svn copy . $(V7_SVN_MODULE)/tags/`echo "v7-V$(V7_VERSION)R$(V7_RELEASE)" | sed "/./s//-/"` -m "tag version" - -mark-version: - @echo " " > $(V7_VERSION_PY) - @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) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done - for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) install; done - -clean: - $(MAKE) -C tests clean - $(MAKE) -C v7 clean - $(MAKE) -C test-env clean - rm -f v7-*.tar.bz2 - rm -f v7.spec - rm -f v7.spec.el4 - $(MAKE) -C docs clean - -package: install v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 - - -v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec - tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ * - - -/tmp/v7/exclude: - mkdir -p /tmp/v7 - echo "CVS" > $@ - echo "save" >> $@ - echo ".*" >> $@ - echo ".patch" >> $@ - echo "v7/*.pyc" >> $@ - echo "test-env/bin/*.pyc" >> $@ - echo "*.bz2" >> $@ - -v7.spec: v7.spec.in Makefile - 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'> $@ - -rpm-prep: v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 v7.spec - rm -rf rpm - mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} - cp v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 rpm/SOURCES/ - cp v7.spec rpm/SPECS - -srpm: rpm-prep - rpmbuild --define "_topdir $(HERE)/rpm" -bs rpm/SPECS/v7.spec - -rpm: rpm-prep - rpmbuild --define "_topdir $(HERE)/rpm" -ba rpm/SPECS/v7.spec -
Copied: tags/v7-V1-1R4/Makefile (from rev 337, trunk/Makefile) =================================================================== --- tags/v7-V1-1R4/Makefile (rev 0) +++ tags/v7-V1-1R4/Makefile 2010-01-27 11:58:02 UTC (rev 338) @@ -0,0 +1,95 @@ +# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material +# is made available to anyone wishing to use, modify, copy, or +# redistribute it subject to the terms and conditions of the GNU General +# Public License v.2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Author: Greg Nichols + +V7_VERSION := 1.1 +V7_RELEASE := 4 +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 + +HERE=$(shell pwd) + +HERE=$(shell pwd) + +HERE=$(shell pwd) + +.PHONY: clean install + +SUBDIRS := test-env v7 tests docs + +all: + 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 + +tag: mark-version + svn copy . $(V7_SVN_MODULE)/tags/`echo "v7-V$(V7_VERSION)R$(V7_RELEASE)" | sed "/./s//-/"` -m "tag version" + +mark-version: + @echo " " > $(V7_VERSION_PY) + @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) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done + for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) install; done + +clean: + $(MAKE) -C tests clean + $(MAKE) -C v7 clean + $(MAKE) -C test-env clean + rm -f v7-*.tar.bz2 + rm -f v7.spec + rm -f v7.spec.el4 + $(MAKE) -C docs clean + +package: install v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 + + +v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec + tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ * + + +/tmp/v7/exclude: + mkdir -p /tmp/v7 + echo "CVS" > $@ + echo "save" >> $@ + echo ".*" >> $@ + echo ".patch" >> $@ + echo "v7/*.pyc" >> $@ + echo "test-env/bin/*.pyc" >> $@ + echo "*.bz2" >> $@ + +v7.spec: v7.spec.in Makefile + 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'> $@ + +rpm-prep: v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 v7.spec + rm -rf rpm + mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} + cp v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 rpm/SOURCES/ + cp v7.spec rpm/SPECS + +srpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -bs rpm/SPECS/v7.spec + +rpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -ba rpm/SPECS/v7.spec +
Modified: tags/v7-V1-1R4/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-27 11:43:50 UTC (rev 335) +++ tags/v7-V1-1R4/v7/version.py 2010-01-27 11:58:02 UTC (rev 338) @@ -1,5 +1,5 @@
# v7/version.py is automatically-generated - DO NOT EDIT -version = '1.0' -release = '23' -rhel_version = '6' +version = '1.1' +release = '4' +rhel_version = '5'
v7-commits@lists.stg.fedorahosted.org
-
gnichols＠fedoraproject.org