1 files changed, 4 insertions, 30 deletions
diff --git a/src/Makefile b/src/Makefile
index 37c384bc..942e4776 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -59,7 +59,7 @@ release: clean
 	@echo " "
 	@echo "The final archive is ./$(NAME)-$(VERSION).tar.bz2."
 
-install:mo gpgkey
+install:mo
 	python setup.py install
 	@rm -rf build/lib
 
@@ -67,40 +67,18 @@ version:
 	@echo "The version is $(NAME)-$(VERSION)"
 
 clean:
-	@rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 sosreport.1.gz gpgkeys/rhsupport.*
+	@rm -fv *~ .*~ changenew ChangeLog.old $(NAME)-$(VERSION).tar.bz2 sosreport.1.gz
 	@rm -rfv build/*
 
-internal-rpm: gpgkey
-	@test -f sos-internal.spec
-	@mkdir -p $(TOPDIR)/SOURCES $(TOPDIR)/SRPMS $(TOPDIR)/RPMS $(TOPDIR)/BUILD $(SRCDIR)/dist
-	cp gpgkeys/rhsupport.pub gpgkeys/rhsupport.key $(TOPDIR)/SOURCES
-
-#	this builds an RPM from the current working copy
-	@cd $(TOPDIR)/BUILD ; \
-	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.pub --exclude gpgkeys/rhsupport.key \
-	-chSpf $(TOPDIR)/SOURCES/$(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) ; \
-	rm -f $(NAME)-$(VERSION)
-
-	rpmbuild -ba --define="_topdir $(TOPDIR)" sos-internal.spec
-	@mv $(TOPDIR)/RPMS/noarch/$(NAME)-internal-*.rpm $(TOPDIR)/SRPMS/$(NAME)-internal-*.rpm dist/
-	cp gpgkeys/rhsupport.key dist/
-
-rpm:	mo gpgkey
-	@mkdir -p $(TOPDIR)/SOURCES $(TOPDIR)/SRPMS $(TOPDIR)/RPMS $(TOPDIR)/BUILD $(SRCDIR)/dist
-
-	cp gpgkeys/rhsupport.pub $(TOPDIR)/SOURCES
-
+rpm:	mo
 	@test -f sos.spec
+	@mkdir -p $(TOPDIR)/SOURCES $(TOPDIR)/SRPMS $(TOPDIR)/RPMS $(TOPDIR)/BUILD $(SRCDIR)/dist
 
 #	this builds an RPM from the current working copy
 	@cd $(TOPDIR)/BUILD ; \
 	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.pub --exclude gpgkeys/rhsupport.key \
 	-chSpf $(TOPDIR)/SOURCES/$(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) ; \
 	rm -f $(NAME)-$(VERSION)
 
@@ -117,7 +95,3 @@ 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