merged navid-dev -r r350:r364 into trunk/rhel-5-startr1.7-8

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@368 ef72aa8b-4018-0410-8976-d6e080ef94d8

1 files changed, 9 insertions, 4 deletions

diff --git a/src/Makefile b/src/Makefile
index b1c1d946..1fa477a3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,12 +4,12 @@
 
 NAME    = sos
 VERSION = $(shell awk '/^%define version / { print $$3 }' sos.spec)
+RELEASE = $(shell awk '/^%define release / { print $$3 }' sos.spec)
 REPO = https://sos.108.redhat.com/svn/sos
-SVNTAG  = r$(subst .,-,$(VERSION))
+SVNTAG  = r$(subst .,-,$(VERSION))_$(RELEASE)
 SRCDIR = $(PWD)
 TOPDIR = $(PWD)/build/rpm-$(NAME)-$(VERSION)
 
-
 all:
 
 .PHONY: tag-release tarball release install version clean
@@ -59,7 +59,7 @@ release: clean
 	@echo " "
 	@echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2."
 
-install:mo
+install:mo gpgkey
 	python setup.py install
 	@rm -rf build/lib
 
@@ -67,7 +67,7 @@ version:
 	@echo "The version is $(NAME)-$(VERSION)"
 
 clean:
-	@rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 sosreport.1.gz
+	@rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 sosreport.1.gz gpgkeys/rhsupport.*
 	@rm -rfv build/*
 
 rpm:	mo
@@ -79,6 +79,7 @@ rpm:	mo
 	rm -rf $(NAME)-$(VERSION) ; \
 	ln -s $(SRCDIR) $(NAME)-$(VERSION) ; \
 	tar --gzip --exclude=.svn --exclude=svn-commit.tmp --exclude=$(NAME)-$(VERSION)/build --exclude=$(NAME)-$(VERSION)/dist \
+	--exclude gpgkeys/rhsupport.key \
 	-chSpf $(TOPDIR)/SOURCES/$(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) ; \
 	rm -f $(NAME)-$(VERSION)
 
@@ -95,3 +96,7 @@ pot:
 
 mo:
 	find locale/*/LC_MESSAGES -name sos.po -exec python tools/msgfmt.py {} \;
+
+gpgkey:
+	@test -f gpgkeys/rhsupport.pub && echo "GPG key already exists." || \
+	gpg --batch --gen-key gpgkeys/gpg.template