Author: pmatilai
Update of /cvs/pkgs/rpms/apt/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29699
Modified Files: apt.spec rpmpriorities sources Added Files: apt-0.5.15lorg3.95.git416-cronjob.patch apt-0.5.15lorg3.95.git416-distroverpkg.patch Log Message: - Sync from rawhide to get something remotely working into F10
apt-0.5.15lorg3.95.git416-cronjob.patch:
--- NEW FILE apt-0.5.15lorg3.95.git416-cronjob.patch --- commit 49f452cf84f8e8f3a681d247ad2a744993ebb989 Author: Panu Matilainen pmatilai@redhat.com Date: Tue Dec 23 10:46:56 2008 +0200
Don't enable cronjob by default (rhbz#445096) - seems the new INIT INFO stuff overrides whatever chkconfig was told, duh...
diff --git a/contrib/apt-cron/apt.init b/contrib/apt-cron/apt.init index a4a0d93..134fc65 100644 --- a/contrib/apt-cron/apt.init +++ b/contrib/apt-cron/apt.init @@ -15,8 +15,8 @@ # Provides: lsb-apt-cron # Required-Start: $local_fs $network # Required-Stop: $local_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Start: +# Default-Stop: # Short-Description: Enable or disable automated updates via apt-rpm # Description: Enable or disable automated updates via apt-rpm ### END INIT INFO
apt-0.5.15lorg3.95.git416-distroverpkg.patch:
--- NEW FILE apt-0.5.15lorg3.95.git416-distroverpkg.patch --- commit 06f5fdb6e1ca0e1605522bcf47e244876a389701 Author: Panu Matilainen pmatilai@redhat.com Date: Wed Dec 31 12:41:38 2008 +0200
Look into provides when searching distrover pkg (rhbz#474911)
diff --git a/apt-pkg/rpm/rpmhandler.cc b/apt-pkg/rpm/rpmhandler.cc index d101d10..3d4342d 100644 --- a/apt-pkg/rpm/rpmhandler.cc +++ b/apt-pkg/rpm/rpmhandler.cc @@ -905,11 +905,12 @@ bool RPMDBHandler::Jump(off_t Offset) return true; }
-bool RPMDBHandler::JumpByName(string PkgName) +bool RPMDBHandler::JumpByName(string PkgName, bool Provides) { + raptTag tag = (raptTag)(Provides ? RPMTAG_PROVIDES : RPMDBI_LABEL); if (RpmIter == NULL) return false; rpmdbFreeIterator(RpmIter); - RpmIter = raptInitIterator(Handler, RPMDBI_LABEL, PkgName.c_str(), 0); + RpmIter = raptInitIterator(Handler, tag, PkgName.c_str(), 0); HeaderP = rpmdbNextIterator(RpmIter); return (HeaderP != NULL); } diff --git a/apt-pkg/rpm/rpmhandler.h b/apt-pkg/rpm/rpmhandler.h index 3d3fc3d..6c7c372 100644 --- a/apt-pkg/rpm/rpmhandler.h +++ b/apt-pkg/rpm/rpmhandler.h @@ -233,7 +233,7 @@ class RPMDBHandler : public RPMHdrHandler virtual bool OrderedOffset() {return false;}
// used by rpmSystem::DistroVer() - bool JumpByName(string PkgName); + bool JumpByName(string PkgName, bool Provides=false);
RPMDBHandler(bool WriteLock=false); virtual ~RPMDBHandler(); diff --git a/apt-pkg/rpm/rpmsystem.cc b/apt-pkg/rpm/rpmsystem.cc index 47ba1e1..f8245d4 100644 --- a/apt-pkg/rpm/rpmsystem.cc +++ b/apt-pkg/rpm/rpmsystem.cc @@ -210,7 +210,7 @@ string rpmSystem::DistroVer() return "";
string DistroVersion = ""; - if (RpmDB->JumpByName(DistroVerPkg) == true) { + if (RpmDB->JumpByName(DistroVerPkg, true) == true) { DistroVersion = RpmDB->Version(); } else { _error->Error(_("Unable to determine version for package %s"),
Index: apt.spec =================================================================== RCS file: /cvs/pkgs/rpms/apt/F-10/apt.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- apt.spec 1 Aug 2008 13:46:27 -0000 1.56 +++ apt.spec 31 Dec 2008 11:00:24 -0000 1.57 @@ -3,17 +3,21 @@ %define generate_rpmpriorities 0 %define comps %{_datadir}/comps/%{_build_arch}/comps.xml
+%define aptver 0.5.15lorg3.95 +%define snapver git416 +%define srcver %{aptver}.%{snapver} + Summary: Debian's Advanced Packaging Tool with RPM support Name: apt -Version: 0.5.15lorg3.94 -Release: 4%{?dist} +Version: %{aptver} +Release: 0.%{snapver}.3%{?dist} Group: System Environment/Base URL: http://apt-rpm.org/ # SourceLicense: GPLv2+ except lua/ which is MIT License: GPLv2+
#Source0: http://laiskiainen.org/apt/testing/%%7Bname%7D-%%7Bversion%7D.tar.bz2 -Source0: http://apt-rpm.org/testing/%%7Bname%7D-%%7Bversion%7D.tar.bz2 +Source0: http://apt-rpm.org/testing/%%7Bname%7D-%%7Bsrcver%7D.tar.bz2
# user editable template configs Source1: apt.conf @@ -36,10 +40,10 @@ Patch0: apt-0.5.15lorg3.2-ppc.patch # band aid for mmap issues (#211254) Patch1: apt-0.5.15lorg3.x-cache-corruption.patch -Patch2: apt-0.5.15lorg3.94-tool-headers.patch -Patch3: apt-0.5.15lorg3.94-gcc43.patch -# for rpm 4.6 -Patch4: apt-0.5.15lorg3.94-makebuild.patch + +# Patches already upstream +Patch100: apt-0.5.15lorg3.95.git416-cronjob.patch +Patch101: apt-0.5.15lorg3.95.git416-distroverpkg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,9 +66,11 @@ %endif # libxml2-devel, #183689 BuildRequires: pkgconfig +BuildRequires: lua-devel >= 5.1 +BuildRequires: autoconf, automake Requires: gnupg Requires: bzip2 -Requires: fedora-release >= 4 +Requires: system-release >= 4 Requires(post): chkconfig Requires(post): ldconfig Requires(preun): chkconfig @@ -121,12 +127,12 @@
%prep -%setup -q +%setup -q -n %{name}-%{srcver} %patch0 -p1 -b .ppc %patch1 -p0 -b .mmap -%patch2 -p1 -b .toolheader -%patch3 -p1 -b .gcc43 -%patch4 -p1 -b .rpm46 + +%patch100 -p1 -b .cronjob +%patch101 -p1 -b .distroverpkg
install -pm 644 %{SOURCE19} comps2prio.xsl
@@ -134,7 +140,8 @@ find contrib/ -type f | xargs chmod 0644
%build -%configure --disable-dependency-tracking --disable-static +%configure --disable-dependency-tracking --disable-static \ + CPPFLAGS=-D_RPM_4_4_COMPAT
make %{?_smp_mflags}
@@ -227,7 +234,7 @@ %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS* COPYING* ABOUT* TODO comps2prio.xsl doc/examples/ contrib/ -%doc ChangeLog lua/COPYRIGHT +%doc ChangeLog
%dir %{_sysconfdir}/apt/ %config(noreplace) %{_sysconfdir}/apt/apt.conf @@ -292,6 +299,25 @@
%changelog +* Wed Dec 31 2008 Panu Matilainen pmatilai@redhat.com - 0.5.15lorg3.95-0.git416.3 +- trim down ancient cruft in rpmpriorities (#444287) +- depend on system-release instead of fedora-release (#474911) +- look into provides when looking for DistroVerPkg + +* Wed Dec 31 2008 Panu Matilainen pmatilai@redhat.com - 0.5.15lorg3.95-0.git416.2 +- dont enable update "service" by default (#445096) + +* Tue Dec 23 2008 Panu Matilainen pmatilai@redhat.com - 0.5.15lorg3.95-0.git416.1 +- Update to upstream snapshot to get something remotely working... +- Link to external Lua to match what rpm uses (#470728) +- Support varying filenames in repomd (#469805) + +* Mon Dec 15 2008 Lubomir Rintel lkundrak@v3.sk - 0.5.15lorg3.94-6 +- Fix internal lua crash, link against system lua 5.1 + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams ivazqueznet+rpm@gmail.com - 0.5.15lorg3.94-5 +- Rebuild for Python 2.6 + * Fri Aug 1 2008 Axel Thimm athimm@localhost.localdomain - 0.5.15lorg3.94-4 - Support for rpm 4.6 (Caolan McNamara caolanm@redhat.com).
Index: rpmpriorities =================================================================== RCS file: /cvs/pkgs/rpms/apt/F-10/rpmpriorities,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rpmpriorities 11 Jan 2008 20:50:40 -0000 1.7 +++ rpmpriorities 31 Dec 2008 11:00:24 -0000 1.8 @@ -1,35 +1,22 @@ Essential: grub - ed - kbd - iproute libgcc - setserial - file rpm rsyslog - losetup - kudzu glibc shadow-utils coreutils bash - iputils vim-minimal passwd - cpio - raidtools - sysvinit - authconfig - hdparm - hotplug - readline util-linux-ng basesystem setup e2fsprogs + pam procps initscripts filesystem - fedora-release + system-release udev + upstart
Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/apt/F-10/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 11 Jan 2008 20:50:40 -0000 1.18 +++ sources 31 Dec 2008 11:00:24 -0000 1.19 @@ -1,3 +1,3 @@ 319591417226d12f0264cce78a1c95fa apt-0.5.15lorg3.2-ppc.patch 6c2e9568a0c2bbe6b0bbd1aa0643a377 apt-0.5.15lorg3.x-cache-corruption.patch -91075f1f0226eaf2dadc73cee00c3de1 apt-0.5.15lorg3.94.tar.bz2 +a9fe12089bedfbb37ef48552f23874a9 apt-0.5.15lorg3.95.git416.tar.bz2