[packages/apt.git] / apt-rpm5.patch

--- apt-0.5.15lorg3.94a/configure.ac.orig	2015-02-05 18:11:36.748429800 +0100
+++ apt-0.5.15lorg3.94a/configure.ac	2015-02-05 20:40:37.388054598 +0100
@@ -99,8 +99,8 @@
 fi
 
 dnl Various rpm header checks..
-AC_CHECK_HEADER(rpm/rpmlib.h, [],
-	   [AC_MSG_ERROR([Can't find rpmlib.h])])
+AC_CHECK_HEADER(rpm/rpmio.h, [],
+	   [AC_MSG_ERROR([Can't find rpmio.h])])
 AC_CHECK_HEADERS([rpm/rpmsx.h rpm/rpmcallback.h rpm/rpmcb.h \
 	     rpm/rpmmessages.h rpm/rpmevr.h])
 
@@ -116,7 +116,7 @@
 	[AC_MSG_RESULT(no) ])
 	
 AC_MSG_CHECKING(for fdigests)
-AC_EGREP_HEADER(RPMTRANS_FLAG_NOFDIGESTS, rpm/rpmlib.h,
+AC_EGREP_HEADER(RPMTRANS_FLAG_NOFDIGESTS, rpm/rpmts.h,
 	[AC_MSG_RESULT(yes) AC_DEFINE(RPM_HAVE_FDIGESTS, 1, [fdigests]) ],
 	[AC_MSG_RESULT(no) ])
 
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/aptcallback.cc.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/aptcallback.cc	2015-02-05 21:20:41.861287026 +0100
@@ -1,6 +1,6 @@
 #include <map>
 #include <stdio.h>
-#include <rpm/rpmlib.h>
+#include <rpm/rpmio.h>
 #include <apti18n.h>
 
 #include <apt-pkg/progress.h>
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmhandler.h.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmhandler.h	2015-02-05 21:21:37.227951369 +0100
@@ -21,7 +21,7 @@
 #include "sqlite.h"
 #endif
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpm4compat.h>
 #include <rpm/rpmmacro.h>
 
 #include <sys/types.h>
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpackagedata.cc.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpackagedata.cc	2015-02-05 21:41:50.177900464 +0100
@@ -12,7 +12,7 @@
 
 #include <apti18n.h>
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpm4compat.h>
 
 RPMPackageData::RPMPackageData()
    :
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpm.h.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpm.h	2015-02-05 21:47:51.287885311 +0100
@@ -11,7 +11,7 @@
 #ifndef PKGLIB_rpmPM_H
 #define PKGLIB_rpmPM_H
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpm4compat.h>
 #if RPM_VERSION >= 0x040100
 #include <rpm/rpmts.h>
 #endif
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpm.cc.orig	2015-02-05 21:47:55.474551799 +0100
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpm.cc	2015-02-08 16:16:03.291176510 +0100
@@ -709,6 +709,7 @@
 	    if (rc)
 	       _error->Error(_("Failed adding %s to transaction %s"),
 			     *I, "(install)");
+	    using ::Header;
 	    headerFree(hdr);
 	    Fclose(fd);
 	    break;
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmsystem.cc.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmsystem.cc	2015-02-08 16:23:09.601158619 +0100
@@ -38,7 +38,6 @@
 #include <stdlib.h>
 #include <dirent.h>
 #include <fcntl.h>
-#include <rpm/rpmlib.h>
 #include <assert.h>
 #include <time.h>
 									/*}}}*/
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmversion.cc.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmversion.cc	2015-02-08 16:31:54.937803242 +0100
@@ -27,7 +27,7 @@
 #include "rpmversion.h"
 #include <apt-pkg/pkgcache.h>
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpm4compat.h>
 
 #include <stdlib.h>
 #include <assert.h>
--- apt-0.5.15lorg3.94a/tools/genpkglist.cc.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/tools/genpkglist.cc	2015-02-08 17:08:43.291043897 +0100
@@ -6,7 +6,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <rpm/rpmlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
--- apt-0.5.15lorg3.94a/tools/cached_md5.cc.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/tools/cached_md5.cc	2015-02-08 17:09:19.007709065 +0100
@@ -6,7 +6,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <rpm/rpmlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
--- apt-0.5.15lorg3.94a/tools/gensrclist.cc.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/tools/gensrclist.cc	2015-02-08 17:11:07.871037829 +0100
@@ -6,7 +6,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <rpm/rpmlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
--- apt-0.5.15lorg3.94a/tools/countpkglist.cc.orig	2008-01-12 10:45:07.000000000 +0100
+++ apt-0.5.15lorg3.94a/tools/countpkglist.cc	2015-02-08 17:12:58.104366537 +0100
@@ -2,7 +2,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpm4compat.h>
 
 int main(int argc, char *argv[])
 {
Commit	Line	Data
7fa0d7cf JB	1	--- apt-0.5.15lorg3.94a/configure.ac.orig 2015-02-05 18:11:36.748429800 +0100
	2	+++ apt-0.5.15lorg3.94a/configure.ac 2015-02-05 20:40:37.388054598 +0100
	3	@@ -99,8 +99,8 @@
	4	fi
	5
	6	dnl Various rpm header checks..
	7	-AC_CHECK_HEADER(rpm/rpmlib.h, [],
	8	- [AC_MSG_ERROR([Can't find rpmlib.h])])
	9	+AC_CHECK_HEADER(rpm/rpmio.h, [],
	10	+ [AC_MSG_ERROR([Can't find rpmio.h])])
	11	AC_CHECK_HEADERS([rpm/rpmsx.h rpm/rpmcallback.h rpm/rpmcb.h \
	12	rpm/rpmmessages.h rpm/rpmevr.h])
	13
	14	@@ -116,7 +116,7 @@
	15	[AC_MSG_RESULT(no) ])
	16
	17	AC_MSG_CHECKING(for fdigests)
	18	-AC_EGREP_HEADER(RPMTRANS_FLAG_NOFDIGESTS, rpm/rpmlib.h,
	19	+AC_EGREP_HEADER(RPMTRANS_FLAG_NOFDIGESTS, rpm/rpmts.h,
	20	[AC_MSG_RESULT(yes) AC_DEFINE(RPM_HAVE_FDIGESTS, 1, [fdigests]) ],
	21	[AC_MSG_RESULT(no) ])
	22
	23	--- apt-0.5.15lorg3.94a/apt-pkg/rpm/aptcallback.cc.orig 2008-01-12 10:45:07.000000000 +0100
	24	+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/aptcallback.cc 2015-02-05 21:20:41.861287026 +0100
	25	@@ -1,6 +1,6 @@
	26	#include <map>
	27	#include <stdio.h>
	28	-#include <rpm/rpmlib.h>
	29	+#include <rpm/rpmio.h>
	30	#include <apti18n.h>
	31
	32	#include <apt-pkg/progress.h>
	33	--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmhandler.h.orig 2008-01-12 10:45:07.000000000 +0100
	34	+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmhandler.h 2015-02-05 21:21:37.227951369 +0100
	35	@@ -21,7 +21,7 @@
	36	#include "sqlite.h"
	37	#endif
	38
	39	-#include <rpm/rpmlib.h>
	40	+#include <rpm/rpm4compat.h>
	41	#include <rpm/rpmmacro.h>
	42
	43	#include <sys/types.h>
	44	--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpackagedata.cc.orig 2008-01-12 10:45:07.000000000 +0100
	45	+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpackagedata.cc 2015-02-05 21:41:50.177900464 +0100
	46	@@ -12,7 +12,7 @@
	47
	48	#include <apti18n.h>
	49
	50	-#include <rpm/rpmlib.h>
	51	+#include <rpm/rpm4compat.h>
	52
	53	RPMPackageData::RPMPackageData()
	54	:
	55	--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpm.h.orig 2008-01-12 10:45:07.000000000 +0100
	56	+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpm.h 2015-02-05 21:47:51.287885311 +0100
	57	@@ -11,7 +11,7 @@
	58	#ifndef PKGLIB_rpmPM_H
	59	#define PKGLIB_rpmPM_H
	60
	61	-#include <rpm/rpmlib.h>
	62	+#include <rpm/rpm4compat.h>
	63	#if RPM_VERSION >= 0x040100
	64	#include <rpm/rpmts.h>
65	#endif
66	--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpm.cc.orig 2015-02-05 21:47:55.474551799 +0100
67	+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmpm.cc 2015-02-08 16:16:03.291176510 +0100
68	@@ -709,6 +709,7 @@
69	if (rc)
70	_error->Error(_("Failed adding %s to transaction %s"),
71	*I, "(install)");
72	+ using ::Header;
73	headerFree(hdr);
74	Fclose(fd);
75	break;
76	--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmsystem.cc.orig 2008-01-12 10:45:07.000000000 +0100
77	+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmsystem.cc 2015-02-08 16:23:09.601158619 +0100
78	@@ -38,7 +38,6 @@
79	#include <stdlib.h>
80	#include <dirent.h>
81	#include <fcntl.h>
82	-#include <rpm/rpmlib.h>
83	#include <assert.h>
84	#include <time.h>
85	/}}}/
86	--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmversion.cc.orig 2008-01-12 10:45:07.000000000 +0100
87	+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmversion.cc 2015-02-08 16:31:54.937803242 +0100
88	@@ -27,7 +27,7 @@
89	#include "rpmversion.h"
90	#include <apt-pkg/pkgcache.h>
91
92	-#include <rpm/rpmlib.h>
93	+#include <rpm/rpm4compat.h>
94
95	#include <stdlib.h>
96	#include <assert.h>
97	--- apt-0.5.15lorg3.94a/tools/genpkglist.cc.orig 2008-01-12 10:45:07.000000000 +0100
98	+++ apt-0.5.15lorg3.94a/tools/genpkglist.cc 2015-02-08 17:08:43.291043897 +0100
99	@@ -6,7 +6,6 @@
100	#include <dirent.h>
101	#include <errno.h>
102	#include <fcntl.h>
103	-#include <rpm/rpmlib.h>
104	#include <stdlib.h>
105	#include <string.h>
106	#include <sys/stat.h>
107	--- apt-0.5.15lorg3.94a/tools/cached_md5.cc.orig 2008-01-12 10:45:07.000000000 +0100
108	+++ apt-0.5.15lorg3.94a/tools/cached_md5.cc 2015-02-08 17:09:19.007709065 +0100
109	@@ -6,7 +6,6 @@
110	#include <dirent.h>
111	#include <errno.h>
112	#include <fcntl.h>
113	-#include <rpm/rpmlib.h>
114	#include <stdlib.h>
115	#include <string.h>
116	#include <sys/stat.h>
117	--- apt-0.5.15lorg3.94a/tools/gensrclist.cc.orig 2008-01-12 10:45:07.000000000 +0100
118	+++ apt-0.5.15lorg3.94a/tools/gensrclist.cc 2015-02-08 17:11:07.871037829 +0100
119	@@ -6,7 +6,6 @@
120	#include <dirent.h>
121	#include <errno.h>
122	#include <fcntl.h>
123	-#include <rpm/rpmlib.h>
124	#include <stdlib.h>
125	#include <string.h>
126	#include <sys/stat.h>
127	--- apt-0.5.15lorg3.94a/tools/countpkglist.cc.orig 2008-01-12 10:45:07.000000000 +0100
128	+++ apt-0.5.15lorg3.94a/tools/countpkglist.cc 2015-02-08 17:12:58.104366537 +0100
129	@@ -2,7 +2,7 @@
130	#include <errno.h>
131	#include <string.h>
132
133	-#include <rpm/rpmlib.h>
134	+#include <rpm/rpm4compat.h>
135
136	int main(int argc, char *argv[])
137	{