rpms/apt/devel apt.spec, 1.16, 1.17 fedora-vendor.list, 1.2, 1.3 sources.list, 1.2, 1.3 gpg-pubkey-8df56d05-3e828977, 1.1, NONE mirror-select.conf, 1.4, NONE mirror-select.lua, 1.2, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	apt.spec fedora-vendor.list sources.list 
Removed Files:
	gpg-pubkey-8df56d05-3e828977 mirror-select.conf 
	mirror-select.lua 
Log Message:
Drop fedora.us stuff, mirror list functionality (#161042), python-abi dep.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apt.spec	28 Apr 2005 20:57:07 -0000	1.16
+++ apt.spec	23 Jun 2005 05:30:54 -0000	1.17
@@ -8,7 +8,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: 0.5.15cnc7
-Release: 5
+Release: 6%{?dist}
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
 License: GPL
@@ -37,7 +37,6 @@
 #Source50:
 #Source51:
 Source52: preserve-conf.lua
-Source53: mirror-select.lua
 Source54: upgradevirt.lua
 
 # 100-149 for sources.list.d
@@ -48,13 +47,10 @@
 # 150-199 for apt.conf.d
 # "factory defaults" for Fedora Core
 Source150: default.conf
-Source151: mirror-select.conf
 
 # 200-249 for trusted gpg keys
 # Fedora key
 Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b
-# Fedora.us key
-Source201: gpg-pubkey-8df56d05-3e828977
 # "Old" RHL key
 Source202: gpg-pubkey-db42a60e-37ea5438
 # Fedora Extras key
@@ -113,7 +109,6 @@
 Summary: Python bindings for libapt-pkg
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 %description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
@@ -202,21 +197,18 @@
 install -p -m 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
 
 # install config parts
-for cnf in %{SOURCE150} %{SOURCE151}; do
-	install -p -m 644 $cnf $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
-done
-
+install -p -m 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
 install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # GPG keys
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
-for gpgkey in %{SOURCE200} %{SOURCE201} %{SOURCE202} %{SOURCE203}; do
+for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203}; do
 	install -p -m 644  $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
 done
 
 # Lua scripts
 mkdir -p $RPM_BUILD_ROOT%{scriptdir}
-for script in %{SOURCE52} %{SOURCE53} %{SOURCE54}; do
+for script in %{SOURCE52} %{SOURCE54}; do
 	install -p -m 755 $script $RPM_BUILD_ROOT%{scriptdir}
 done
 
@@ -335,6 +327,11 @@
 
 
 %changelog
+* Wed Jun 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15cnc7-6
+- Drop fedora.us GPG key and vendors.list entry.
+- Remove mirror list stuff (#161042).
+- Drop no longer needed explicit python-abi dependency.
+
 * Thu Apr 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15cnc7-5
 - Fix apt-shell "install kernel" crash (#155990, Panu Matilainen).
 


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


Index: sources.list
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources.list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources.list	8 Nov 2004 04:04:37 -0000	1.2
+++ sources.list	23 Jun 2005 05:30:54 -0000	1.3
@@ -1,3 +1 @@
-# Please choose the nearest mirror http://www.fedora.us/wiki/FedoraMirrorList
-
 # Add any local / 3rd party repositories here..


--- gpg-pubkey-8df56d05-3e828977 DELETED ---


--- mirror-select.conf DELETED ---


--- mirror-select.lua DELETED ---