fedora-rpmdevtools Makefile.am, 1.1, 1.2 configure.ac, 1.1, 1.2 fedora-rpmchecksig, 1.3, 1.4 fedora-rpmdevtools.spec, 1.98, 1.99 fedora-installdevkeys, 1.11, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2194

Modified Files:
	Makefile.am configure.ac fedora-rpmchecksig 
	fedora-rpmdevtools.spec 
Removed Files:
	fedora-installdevkeys 
Log Message:
Drop fedora-installdevkeys and GPG keys, modify rpmchecksig to use system rpmdb.


Index: Makefile.am
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	5 Jun 2006 18:29:39 -0000	1.1
+++ Makefile.am	16 Jul 2006 21:09:23 -0000	1.2
@@ -1,13 +1,13 @@
 AUTOMAKE_OPTIONS = foreign 1.5 dist-bzip2
 
-SUBDIRS = devgpgkeys emacs test
+SUBDIRS = emacs test
 
 pkgdatadir = $(datadir)/fedora
 pkgsysconfdir = $(sysconfdir)/fedora
 rpmlibdir = $(libdir)/rpm
 
 dist_bin_SCRIPTS = fedora-buildrpmtree fedora-diffarchive fedora-extract \
-	fedora-installdevkeys fedora-kmodhelper fedora-md5 fedora-newrpmspec \
+	fedora-kmodhelper fedora-md5 fedora-newrpmspec \
 	fedora-rmdevelrpms fedora-rpmchecksig fedora-rpminfo fedora-rpmvercmp \
 	fedora-wipebuildtree
 


Index: configure.ac
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.ac	5 Jun 2006 18:29:39 -0000	1.1
+++ configure.ac	16 Jul 2006 21:09:23 -0000	1.2
@@ -4,7 +4,6 @@
 AC_PATH_PROG(WGET,wget)
 AC_OUTPUT(
 Makefile
-devgpgkeys/Makefile
 emacs/Makefile
 test/Makefile
 )


Index: fedora-rpmchecksig
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmchecksig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-rpmchecksig	18 Aug 2005 05:49:16 -0000	1.3
+++ fedora-rpmchecksig	16 Jul 2006 21:09:23 -0000	1.4
@@ -120,15 +120,8 @@
     
     
 def main(args):
-    rpmroot = os.path.expanduser('~/.fedorarpm')
-    if not os.path.exists(rpmroot) or not os.path.isdir(rpmroot):
-        rpmroot = '/var/fedora/rpm'
-    if not os.path.exists(rpmroot) or not os.path.isdir(rpmroot):
-        print 'ERROR: Alternate RPM keyring is not installed.  Please run fedora-installdevkeys.'
-        sys.exit(1)
-    
     finalexit = 0
-    ts = rpm.TransactionSet(rpmroot)
+    ts = rpm.TransactionSet()
     for package in args:
         error = 0
         sigerror = 0


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fedora-rpmdevtools.spec	15 Jul 2006 13:26:30 -0000	1.98
+++ fedora-rpmdevtools.spec	16 Jul 2006 21:09:23 -0000	1.99
@@ -29,7 +29,6 @@
 development of Fedora RPM packages.  These tools are designed for Fedora
 Core 2 and later.
 fedora-buildrpmtree     Create RPM build tree within user's home directory
-fedora-installdevkeys   Install GPG keys in alternate RPM keyring
 fedora-kmodhelper       Helper script for building kernel module RPMs
 fedora-md5              Display the md5sum of all files in an RPM
 fedora-newrpmspec       Creates new .spec from template
@@ -103,6 +102,10 @@
 
 
 %changelog
+* Sun Jul 16 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Drop fedora-installdevkeys and GPG keys, modify rpmchecksig to use
+  the system rpmdb.
+
 * Sat Jul 15 2006 Ville Skyttä <ville.skytta at iki.fi>
 - Sort rmdevelrpms' output.
 


--- fedora-installdevkeys DELETED ---