From 6a8982400417301a91c2c34e7c540c705b0f11f4 Mon Sep 17 00:00:00 2001
From: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Date: Fri, 16 May 2014 20:08:22 +0400
Subject: [PATCH] Apply apt-0.5.15cnc5-alt-rpm-build.patch

Added in commit 0501f88:
0.5.15cnc5-alt1

- Specfile cleanup.
- Rediffed patches.
- Fixed --help/--version segfault.
- Fixed some compilation warnings.
- Relocated methods to /usr/lib/apt/methods/.
---
 apt-0.5.15cnc5-alt-rpm-build.patch | 39 ------------------------------
 apt/configure.in                   |  7 +++---
 apt/tools/cached_md5.cc            |  1 +
 3 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 apt-0.5.15cnc5-alt-rpm-build.patch

diff --git a/apt-0.5.15cnc5-alt-rpm-build.patch b/apt-0.5.15cnc5-alt-rpm-build.patch
deleted file mode 100644
index 5f9437a..0000000
--- a/apt-0.5.15cnc5-alt-rpm-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -uprk.orig apt-0.5.15cnc5.orig/configure.in apt-0.5.15cnc5/configure.in
---- apt-0.5.15cnc5.orig/configure.in	2003-12-23 23:15:40 +0300
-+++ apt-0.5.15cnc5/configure.in	2004-01-15 19:08:18 +0300
-@@ -72,7 +72,7 @@ else
- 		[AC_MSG_ERROR([Can't find libbz2 library])])
-    AC_CHECK_LIB(z,gzopen, [],
- 		[AC_MSG_ERROR([Can't find libz library])])
--   AC_CHECK_HEADERS(db1/db.h)
-+   dnl AC_CHECK_HEADERS(db1/db.h)
- 
-    CPPFLAGS="$CPPFLAGS -I/usr/include/rpm"
-    AC_CHECK_HEADER(rpm/rpmlib.h, [],
-@@ -80,12 +80,13 @@ else
- 
-    if test $RPM_VERSION_MAJOR -lt 4; then
-       RPMLIBS="-lrpm -lz -lbz2 -lpopt"
-+      AC_CHECK_HEADERS(db1/db.h)
-    else
-       AC_CHECK_LIB(rpmdb,rpmdbOpen,
-          [RPMDBLIBS="-lrpmdb"],
--         [RPMDBLIBS="-ldb-3.1"],
-+         [RPMDBLIBS="-ldb"],
-          [-lrpm -lrpmio -lz -lbz2 -lpopt])
--      RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt"
-+      RPMLIBS="-lrpm -lrpmio $RPMDBLIBS"
-    fi
-    AC_MSG_CHECKING(for RPM libraries)
-    AC_MSG_RESULT($RPMLIBS)
-diff -uprk.orig apt-0.5.15cnc5.orig/tools/cached_md5.cc apt-0.5.15cnc5/tools/cached_md5.cc
---- apt-0.5.15cnc5.orig/tools/cached_md5.cc	2003-12-23 23:16:37 +0300
-+++ apt-0.5.15cnc5/tools/cached_md5.cc	2004-01-15 19:07:44 +0300
-@@ -7,6 +7,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <rpm/rpmlib.h>
-+#include <rpm/misc.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
diff --git a/apt/configure.in b/apt/configure.in
index ba80022..50e494e 100644
--- a/apt/configure.in
+++ b/apt/configure.in
@@ -72,7 +72,7 @@ else
 		[AC_MSG_ERROR([Can't find libbz2 library])])
    AC_CHECK_LIB(z,gzopen, [],
 		[AC_MSG_ERROR([Can't find libz library])])
-   AC_CHECK_HEADERS(db1/db.h)
+   dnl AC_CHECK_HEADERS(db1/db.h)
 
    CPPFLAGS="$CPPFLAGS -I/usr/include/rpm"
    AC_CHECK_HEADER(rpm/rpmlib.h, [],
@@ -80,12 +80,13 @@ else
 
    if test $RPM_VERSION_MAJOR -lt 4; then
       RPMLIBS="-lrpm -lz -lbz2 -lpopt"
+      AC_CHECK_HEADERS(db1/db.h)
    else
       AC_CHECK_LIB(rpmdb,rpmdbOpen,
          [RPMDBLIBS="-lrpmdb"],
-         [RPMDBLIBS="-ldb-3.1"],
+         [RPMDBLIBS="-ldb"],
          [-lrpm -lrpmio -lz -lbz2 -lpopt])
-      RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt"
+      RPMLIBS="-lrpm -lrpmio $RPMDBLIBS"
    fi
    AC_MSG_CHECKING(for RPM libraries)
    AC_MSG_RESULT($RPMLIBS)
diff --git a/apt/tools/cached_md5.cc b/apt/tools/cached_md5.cc
index 4df228b..3eb1af4 100644
--- a/apt/tools/cached_md5.cc
+++ b/apt/tools/cached_md5.cc
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <rpm/rpmlib.h>
+#include <rpm/misc.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>