diff options
author | Adrian Likins <alikins@redhat.com> | 2009-02-18 19:41:49 -0500 |
---|---|---|
committer | Adrian Likins <alikins@redhat.com> | 2009-02-18 19:41:49 -0500 |
commit | a3bb8c6bb6717a1431bf67cd09ae21fef2cbed17 (patch) | |
tree | 28e9d312a3f109ca1cb5e808602998917b7279c7 | |
parent | 3cba7a69aa0aec0266e1c71998eb866864f0dbd1 (diff) | |
download | func-a3bb8c6bb6717a1431bf67cd09ae21fef2cbed17.tar.gz func-a3bb8c6bb6717a1431bf67cd09ae21fef2cbed17.tar.xz func-a3bb8c6bb6717a1431bf67cd09ae21fef2cbed17.zip |
remove version file and update spec/makefile/setup.py
-rw-r--r-- | Makefile | 13 | ||||
-rw-r--r-- | func.spec | 5 | ||||
-rw-r--r-- | setup.py | 2 | ||||
-rw-r--r-- | version | 1 |
4 files changed, 5 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 @@ -30,12 +30,6 @@ messages: sed -i'~' -e 's/SOME DESCRIPTIVE TITLE/func/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/func $(VERSION)-$(RELEASE)/g' -e 's/PACKAGE/func/g' $(MESSAGESPOT) -bumprelease: - -echo "$(VERSION) $(NEWRELEASE)" > version - -setversion: - -echo "$(VERSION) $(RELEASE)" > version - build: clean $(PYTHON) setup.py build -f @@ -82,8 +76,6 @@ clean_rpms: sdist: messages $(PYTHON) setup.py sdist -new-rpms: bumprelease rpms - pychecker: -for d in $(PYDIRS); do ($(MAKE) -C $$d pychecker ); done pyflakes: @@ -106,7 +98,6 @@ unittest: 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}" \ @@ -11,9 +11,8 @@ Summary: Remote management framework Name: func -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 @@ -4,7 +4,7 @@ from distutils.core import setup #from setuptools import setup,find_packages NAME = "func" -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 |