rpms/apt/devel gpg-pubkey-1ac70ce6-41bebeef, NONE, 1.1 apt.spec, 1.8, 1.9 default.conf, 1.4, 1.5 fedora-vendor.list, 1.1, 1.2 mirror-select.lua, 1.1, 1.2 gpg-pubkey-731002fa-400b9109, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17681

Modified Files:
	apt.spec default.conf fedora-vendor.list mirror-select.lua 
Added Files:
	gpg-pubkey-1ac70ce6-41bebeef 
Removed Files:
	gpg-pubkey-731002fa-400b9109 
Log Message:
Add Extras key, misc other small improvements mostly from Panu.


--- NEW FILE gpg-pubkey-1ac70ce6-41bebeef ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.0.7 (GNU/Linux)

mQGiBEG+vu8RBACyH3cUSp+DXbyIvZ075bGDhjhRCf8m44UW2cCQdO/45CJBkRnC
AA6SHthCrXCVKIuuo1jSwy8kMXt1P/7IpF6Tc8ZMzcHKTyNetuuD/A7oavgnrJNb
QVTScqbD6VrvjUAPpDz5TMPqMMFYwylp+ySKMQpoPOYoqdNE3XwnA5vOywCg44+S
KDWIV0j5xCeIAoa47VmgF2cEAK/FIZRkbb7+i2Fob1mxKsnuLN/xx67aBpU2w7HO
scVnkke08lRestDVk/6xb+lrq+gVLdNBfAANBrOcwRv2heu+Zu3PZGuC166/JWFM
kx5a9TkI0zQAw72LqKeX4VDBRz5fUoIs/C+3aGc5Mh+h8fZYjJGf0kr/90rnd/0e
WqsBA/9ONArdHN44aICt7xku/t98p9Da04A7kRYTHlLrBk5i0U4JJXKei7ZAzNi4
Or//8ATepQdsBMCJVx1Ss/vJKxupLG9Mw43nbNuA5SmOSPnAoyglYadKyaUXBbVj
mkqf9ZkjOMfD5u9PEWMWMq3f8uf05qxsrBDeiyc7Fk0jBYTvnrQ4RmVkb3JhIFBy
ZSBFeHRyYXMgUmVsZWFzZSA8cHJlLWV4dHJhc0BmZWRvcmFwcm9qZWN0Lm9yZz6I
XgQTEQIAHgUCQb6+7wIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCC7ZUEGscM
5uAMAKC+XaPSCYIpdcmJYEe9rNxYMz/hLwCeOyBYUYA2L0WnbfXuNafRqwta/s2I
RgQSEQIABgUCQgD+/AAKCRC0QmnQTypv0lVYAJoCLolPSuAj873GbV2+m3Bj6sS/
UACeNcDmIWeruRld83uSQcx4xJyEOUa0KUZlZG9yYSBQcm9qZWN0IDxmZWRvcmEt
ZXh0cmFzQHJlZGhhdC5jb20+iF4EExECAB4FAkIAeFQCGwMGCwkIBwMCAxUCAwMW
AgECHgECF4AACgkQgu2VBBrHDOYu8wCffLm57mvcYApV7eqvHXr29gNAbLwAoJVq
JWvgBIvg8/4MiqwKAQ1MDkIUiEYEEhECAAYFAkIA/wQACgkQtEJp0E8qb9LQJACf
c0LteS513+5O6erQO7RBUxC/NI4AniDHK+Ogf5l5Gs2ciwD+WApsZ4mPtDBGZWRv
cmEgUHJvamVjdCA8ZmVkb3JhLWV4dHJhc0BmZWRvcmFwcm9qZWN0Lm9yZz6IXgQT
EQIAHgUCQgB4iQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCC7ZUEGscM5gZ7
AJ9n8CYN6nvMqxCbQQZwvs7e/J4//QCeM3nDwC5EfEbEtOHPIYAqTf3IQZaIRgQS
EQIABgUCQgD/BAAKCRC0QmnQTypv0qKuAJ0cnqk9BbbblRSBbn72bK/BAquzywCe
M7S0C6rfrYlfOjQHQdVB5GitT9u5AQ0EQb6+8RAEAJmsZ5apOFz0Fj6RwX0D+nOU
Atdzd3zpTNzu4j8+L750ePutjuwizEmCxKycchuG+gGasLmdxY+xk5AUB7gLt4ms
eKsWyHvQt+H4wG8jjOjHWXlaJkZaYQUxpVPd6/11hkoqpodJ9ckfoIJnpUJWDcd3
HTW7jdq+ZtBXjQlwvh3HAAMHA/9g50+hqjn23d91SaFTkvaAySZYHEF/xm5sOV1X
Z37XNFdl7JRl6BN7y59PE9Nk6qP4yHqH1G2YNDL3BmejChMF5GmEqluNdnvfFvwk
yqPvE7qCv8BhktPqsnrpFmtfeDFI4vztD08oab9LdkDvQwLHBZpc+wCb4VJzOkaZ
7e7VP4hJBBgRAgAJBQJBvr7xAhsMAAoJEILtlQQaxwzmxdYAn3X4X/ENC3V4yPDR
7X6oVeIVr5fvAJ4n5vY10NpvYKV5arzKd8DSW2m5Bg==
=N/fy
-----END PGP PUBLIC KEY BLOCK-----


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apt.spec	29 Jan 2005 21:19:50 -0000	1.8
+++ apt.spec	18 Feb 2005 22:14:10 -0000	1.9
@@ -17,7 +17,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt
 Version: 0.5.15cnc6
-Release: 15.%{svnver}
+Release: 16.%{svnver}
 Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
@@ -70,8 +70,8 @@
 Source201: gpg-pubkey-8df56d05-3e828977
 # "Old" RHL key
 Source202: gpg-pubkey-db42a60e-37ea5438
-# Fedora Legacy key
-Source203: gpg-pubkey-731002fa-400b9109
+# Fedora Extras key
+Source203: gpg-pubkey-1ac70ce6-41bebeef
 
 # 250-299 for vendor.list.d
 Source250: fedora-vendor.list
@@ -234,7 +234,7 @@
 
 # GPG keys
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
-for gpgkey in %{SOURCE200} %{SOURCE201} %{SOURCE202}; do
+for gpgkey in %{SOURCE200} %{SOURCE201} %{SOURCE202} %{SOURCE203}; do
 	install -p -m 644  $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
 done
 
@@ -360,6 +360,13 @@
 
 
 %changelog
+* Wed Feb 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc6-16.r362
+- Make mirror-select.lua write commented out rpm-src entries for Extras (Panu).
+- Add Extras GPG key (Panu), and add it to fedora-vendors.list.
+- Drop not-installed Fedora Legacy key from SRPM.
+- Comment out Kernel::Set-Default from default.conf; as of FC3+, the kernel
+  packages take care of that automatically (Panu).
+
 * Sat Jan 29 2005 Warren Togami <wtogami at redhat.com> - 0:0.5.15cnc6-15.r362
 - ExcludeArch: ppc64
 


Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.conf	28 Jan 2005 21:13:08 -0000	1.4
+++ default.conf	18 Feb 2005 22:14:10 -0000	1.5
@@ -72,6 +72,7 @@
 // upgradevirt.lua specific item - make newly installed kernel default
 Kernel
 {
-  Set-Default "true";
+  // As of FC3+, the kernel packages take care of this automatically
+  //Set-Default "true";
   Module-Prefix { "kernel-module-"; };
 }


Index: fedora-vendor.list
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/fedora-vendor.list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-vendor.list	8 Nov 2004 04:04:37 -0000	1.1
+++ fedora-vendor.list	18 Feb 2005 22:14:10 -0000	1.2
@@ -1,3 +1,7 @@
+simple-key "extras" {
+	Fingerprint "5389DD00C5BC516812B4327282ED95041AC70CE6";
+	Name "Fedora Project <fedora-extras at redhat.com>";
+}
 simple-key "fdr" {
 	Fingerprint "B5BDCEB28F0D54DE6F4D227529D5BA248DF56D05";
 	Name "Fedora Linux (RPMS) <security at fedora.us>";


Index: mirror-select.lua
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/mirror-select.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mirror-select.lua	8 Nov 2004 04:04:37 -0000	1.1
+++ mirror-select.lua	18 Feb 2005 22:14:10 -0000	1.2
@@ -130,7 +130,8 @@
 				if mirror.selected then
 					srclist:write("# "..entry.name.." ("..mirror.name..")\n")
 					srclist:write("rpm "..mirror.server.."\n")
-					srclist:write("rpm-src "..mirror.server.."\n")
+					-- fedora.us doesn't have src indexes for all components :(
+					srclist:write("#rpm-src "..mirror.server.."\n")
 					srclist:write("\n")
 				end
 			end


--- gpg-pubkey-731002fa-400b9109 DELETED ---