rpms/apt/devel apt-0.5.15lorg3.94-tool-headers.patch, NONE, 1.1 apt.spec, 1.50, 1.51

[Panu Matilainen (pmatilai)]

Author: pmatilai

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

Modified Files:
	apt.spec 
Added Files:
	apt-0.5.15lorg3.94-tool-headers.patch 
Log Message:
Patch over brown paperbag bug in 0.5.15lorg3.94...


apt-0.5.15lorg3.94-tool-headers.patch:

--- NEW FILE apt-0.5.15lorg3.94-tool-headers.patch ---
commit d6087997e31317a7fdcb53973e69e1f9b3c0a0ac
Author: Panu Matilainen <pmatilai at laiskiainen.org>
Date:   Fri Jan 11 23:00:35 2008 +0200

    Oops, forgot to adjust tools/ for rpmhandler going private

diff --git a/tools/cached_md5.cc b/tools/cached_md5.cc
index 4df228b..5bf789b 100644
--- a/tools/cached_md5.cc
+++ b/tools/cached_md5.cc
@@ -17,9 +17,9 @@
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/tagfile.h>
-#include <apt-pkg/rpmhandler.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/md5.h>
+#include "rpmhandler.h"
 
 #include <config.h>
 
diff --git a/tools/genpkglist.cc b/tools/genpkglist.cc
index e067790..c0c608c 100644
--- a/tools/genpkglist.cc
+++ b/tools/genpkglist.cc
@@ -20,9 +20,9 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/rpmhandler.h>
 #include <config.h>
 
+#include "rpmhandler.h"
 #include "cached_md5.h"
 
 #if RPM_VERSION >= 0x040100
diff --git a/tools/gensrclist.cc b/tools/gensrclist.cc
index ea1bb92..0597560 100644
--- a/tools/gensrclist.cc
+++ b/tools/gensrclist.cc
@@ -20,10 +20,10 @@
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/tagfile.h>
-#include <apt-pkg/rpmhandler.h>
 #include <apt-pkg/configuration.h>
 #include <config.h>
 
+#include "rpmhandler.h"
 #include "cached_md5.h"
 
 #if RPM_VERSION >= 0x040100


Index: apt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apt/devel/apt.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- apt.spec	11 Jan 2008 20:50:40 -0000	1.50
+++ apt.spec	11 Jan 2008 21:05:07 -0000	1.51
@@ -36,6 +36,7 @@
 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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -120,6 +121,7 @@
 %setup -q
 %patch0 -p1 -b .ppc
 %patch1 -p0 -b .mmap
+%patch2 -p1 -b .toolheader
 
 install -pm 644 %{SOURCE19} comps2prio.xsl