From 3f3bcc60c426e8c3491e5e117edead43a8809fe8 Mon Sep 17 00:00:00 2001
From: athimm <athimm@fedoraproject.org>
Date: May 20 2006 16:55:17 +0000
Subject: Upgrade apt to latest rc, move some config bits from apt to f-p-c-a.


---

diff --git a/.cvsignore b/.cvsignore
index a37d839..cb8580c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-apt-0.5.15lorg3.tar.bz2
+apt-0.5.15lorg3.1-rc2.tar.bz2
diff --git a/apt.spec b/apt.spec
index 5e29253..d5040d0 100644
--- a/apt.spec
+++ b/apt.spec
@@ -5,13 +5,14 @@
 
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
-Version:        0.5.15lorg3
-Release:        2.1%{?dist}
+Version:        0.5.15lorg3.1
+Release:        3_rc2%{?dist}
 Group:          System Environment/Base
 URL:            http://apt-rpm.laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+#Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0:	http://apt-rpm.org/testing/%{name}-%{version}-rc2.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -23,13 +24,7 @@ Source4:        apt_preferences
 Source5:        rpmpriorities
 Source19:       comps2prio.xsl
 
-# nightly updater scripts & config
-Source20:       apt.init
-Source21:       apt.cron
-Source22:       apt.sysconfig
-
 # Sources 50-99 are for Lua-scripts not in contrib/
-Source50:       preserve-conf.lua
 Source51:       upgradevirt.lua
 
 # 150-199 for apt.conf.d
@@ -114,7 +109,7 @@ RHL/RHEL/FC distributions.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc2
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -178,7 +173,7 @@ ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
 
 # Lua scripts
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
-for script in %{SOURCE50} %{SOURCE51} ; do
+for script in %{SOURCE51} ; do
   install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
 done
 
@@ -189,9 +184,9 @@ install -pm 644 python/apt.py{c,} $RPM_BUILD_ROOT%{python_sitearch}/
 touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
 
 # Nightly updater scripts & default config
-install -Dpm 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -Dpm 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -Dpm 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
 
 # GPG checker from contrib
 install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
@@ -262,7 +257,6 @@ fi
 %dir %{_datadir}/apt/scripts/
 %{_datadir}/apt/scripts/gpg-check.lua
 %{_datadir}/apt/scripts/gpg-import.lua
-%{_datadir}/apt/scripts/preserve-conf.lua
 %{_datadir}/apt/scripts/upgradevirt.lua
 %{_localstatedir}/cache/apt/
 %{_localstatedir}/lib/apt/
@@ -292,6 +286,11 @@ fi
 
 
 %changelog
+* Sat May 20 2006 Axel Thimm <Axel.Thimm@ATrpms.net>
+- Update to 0.5.15lorg3.1-rc2.
+- Move some FC specific config bits to fedora-package-config-apt.
+- Remove some sources that can be found in upstream now.
+
 * Thu May 11 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 0.5.15lorg3-2.1
 - Remove bogus final s from default(s).conf (Ville).
 
diff --git a/default.conf b/default.conf
index 92b4087..7259480 100644
--- a/default.conf
+++ b/default.conf
@@ -9,43 +9,12 @@ APT
   // Options for apt-get
   Get 
   {
-    Download-Only "false";
-    Show-Upgraded "true";
     Show-Versions "true";
-  };
-  Cache
-  {
-    AllNames "false";
-  }  
+  }
 };
 
 RPM
 {
-  // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades)
-  Order "true";
-  // Completely ignore GnuPG signature packages (introduced in rpm 4.1)
-  Ignore { "gpg-pubkey"; };
-  // Allow multiple kernel and kernel-related packages to be installed
-  Allow-Duplicated {
-    "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
-    "^kmod-.+$";
-    "^gpg-pubkey$";
-  };
-  // XXX: not used currently
-  //Allow-Duplicated-Upgrade {
-  //  "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
-  //  "^kmod-.+$";
-  //  "^gpg-pubkey$";
-  //};
-  // "Upgrade" allow-duplicated packages as well
-  Upgrade-Virtual "true";
-  // Enable source rebuilds
-  Source
-  {
-    Build-Command "rpmbuild --rebuild";
-  };
   // Always check GPG keys and automatically import new ones
   GPG-Check "true";
   GPG-Import "true";
diff --git a/sources b/sources
index 39935fb..bd78f73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-167cfdf8dea5eb1a9873a53ff546bf6a  apt-0.5.15lorg3.tar.bz2
+8194eb59fb5fc0fe2680ab4272a3dc04  apt-0.5.15lorg3.1-rc2.tar.bz2