diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | certmaster.spec | 10 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | version | 1 |
4 files changed, 9 insertions, 16 deletions
@@ -1,5 +1,5 @@ -VERSION = $(shell echo `awk '{ print $$1 }' version`) -RELEASE = $(shell echo `awk '{ print $$2 }' version`) +VERSION = 0.24 +RELEASE = 4 NEWRELEASE = $(shell echo $$(($(RELEASE) + 1))) PYTHON = /usr/bin/python @@ -24,13 +24,6 @@ messages: certmaster/*.py xgettext -k_ -kN_ -o $(MESSAGESPOT) certmaster/*.py sed -i'~' -e 's/SOME DESCRIPTIVE TITLE/certmaster/g' -e 's/YEAR THE PACKAGE'"'"'S COPYRIGHT HOLDER/2007 Red Hat, inc. /g' -e 's/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR/Adrian Likins <alikins@redhat.com>, 2007/g' -e 's/PACKAGE VERSION/certmaster $(VERSION)-$(RELEASE)/g' -e 's/PACKAGE/certmaster/g' $(MESSAGESPOT) - -bumprelease: - -echo "$(VERSION) $(NEWRELEASE)" > version - -setversion: - -echo "$(VERSION) $(RELEASE)" > version - build: clean $(PYTHON) setup.py build -f @@ -93,7 +86,6 @@ async: install rpms: build manpage sdist mkdir -p rpm-build cp dist/*.gz rpm-build/ - cp version rpm-build/ rpmbuild --define "_topdir %(pwd)/rpm-build" \ --define "_builddir %{_topdir}" \ --define "_rpmdir %{_topdir}" \ diff --git a/certmaster.spec b/certmaster.spec index ced8847..3c90f4d 100644 --- a/certmaster.spec +++ b/certmaster.spec @@ -16,9 +16,8 @@ Summary: Remote certificate distribution framework Name: certmaster -Source1: version -Version: %(echo `awk '{ print $1 }' %{SOURCE1}`) -Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist} +Version: 0.24 +Release: 4%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -131,13 +130,16 @@ fi %changelog +* Wed Feb 18 2009 Adrian Likins <alikins@redhat.com> - 0.24.4 +- remove version file + * Mon Jan 19 2009 Adrian Likins <alikins@redhat.com> - 0.24.4 - make inclusion of egginfo dependant on having python >= 2.5 - remove need for patch on rhel3+python2.4 cases (distutils should do all the /usr/bin/python renaming now) - minor reformatting changes -* Tue Jan 06 2009 Greg Swift <gregswift@gmail.com> - 0.24-3 +* Tue Jan 06 2009 Greg Swift <gregswift@gmail.com> - 0.24-3x1 - Fixed spec because it was only building in rhel3 * Wed Dec 31 2008 Greg Swift <gregswift@gmail.com> - 0.24-2 @@ -4,7 +4,7 @@ from distutils.core import setup #from setuptools import setup,find_packages NAME = "certmaster" -VERSION = open("version", "r+").read().split()[0] +VERSION = "0.24" SHORT_DESC = "%s remote configuration and management api" % NAME LONG_DESC = """ A small pluggable xml-rpc daemon used by %s to implement various web services hooks diff --git a/version b/version deleted file mode 100644 index be1ba6c..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -0.24 4 |