diff options
| author | shnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-07-02 19:30:19 +0000 |
|---|---|---|
| committer | shnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-07-02 19:30:19 +0000 |
| commit | bbe814525a51839b32d40321d5ff6d47420b41c5 (patch) | |
| tree | 549236a255312f8a1881efa7195095ea1a1047b7 /src/Makefile | |
| parent | 96e5f9dab0596952f916f958b79a07d59135f078 (diff) | |
| download | sos-bbe814525a51839b32d40321d5ff6d47420b41c5.tar.gz | |
* removed useless sos.spec (it is generated on the fly by setup.py)r1.6
* added changelog information to setup.cfg
* minor fixes/enhancements to Makefile
* added "make rpm"
* fixed "License" of rpm package
* changed packager name
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@157 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index f58a359e..1b93d7f6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,7 +3,7 @@ # NAME = sos -VERSION = $(shell awk '/Version/ { print $$2 }' sos.spec) +VERSION = $(shell grep -e 'version = ' setup.py |cut -d \' -f 2) REPO = https://sos.108.redhat.com/svn/sos SVNTAG = r$(subst .,-,$(VERSION)) SVN_TAG_CONTENTS := $(shell svn list $(REPO)/tags/$(SVNTAG)/Makefile) @@ -16,11 +16,12 @@ all: tag-release: ifeq ($(strip $(SVN_TAG_CONTENTS)), Makefile) @echo "The repository already contains a tag for version $(VERSION)" + @exit 1 else @svn copy $(REPO)/trunk/src $(REPO)/tags/$(SVNTAG) \ -m "Tagging the $(SVNTAG) release of the sos project" - @echo "$(SVNTAG)" - @svn update ../../tags + @echo "Tagged as $(SVNTAG)" + SVN_TAG_CONTENTS := $(shell svn list $(REPO)/tags/$(SVNTAG)/Makefile) endif # if we don't compress them, rpmbuild does, and this breaks things @@ -67,3 +68,6 @@ version: clean: @rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 sosreport.1.gz + +rpm: + python setup.py bdist_rpm |