1.1 --- a/openpkg/rpm.patch.feature Mon Mar 28 19:41:02 2011 +0200
1.2 +++ b/openpkg/rpm.patch.feature Tue Mar 29 19:46:35 2011 +0200
1.3 @@ -968,7 +968,7 @@
1.4 Index: configure.ac
1.5 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
1.6 +++ configure.ac 13 Sep 2006 13:39:12 -0000
1.7 -@@ -1200,12 +1202,12 @@
1.8 +@@ -1200,12 +1201,12 @@
1.9 AC_SUBST(LOCALEDIR)
1.10 LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
1.11 AC_SUBST(LIBDIR)
1.12 @@ -983,7 +983,7 @@
1.13 AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR",
1.14 [Full path to rpm system configuration directory (usually /etc/rpm)])
1.15 AC_SUBST(SYSCONFIGDIR)
1.16 -@@ -1215,17 +1217,17 @@
1.17 +@@ -1215,17 +1216,17 @@
1.18 [Colon separated paths of macro files to read.])
1.19 AC_SUBST(MACROFILES)
1.20
1.21 @@ -1560,7 +1560,7 @@
1.22 Index: rpmio/macro.c
1.23 --- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
1.24 +++ rpmio/macro.c 22 Jan 2004 21:42:32 -0000 1.2
1.25 -@@ -1114,9 +1119,11 @@
1.26 +@@ -1116,9 +1119,11 @@
1.27 case 2: /* COMPRESSED_BZIP2 */
1.28 sprintf(be, "%%_bzip2 %s", b);
1.29 break;
1.30 @@ -1572,7 +1572,7 @@
1.31 }
1.32 b = be;
1.33 } else if (STREQ("S", f, fn)) {
1.34 -@@ -1717,9 +1725,11 @@
1.35 +@@ -1720,9 +1725,11 @@
1.36
1.37 if ((magic[0] == 'B') && (magic[1] == 'Z')) {
1.38 *compressed = COMPRESSED_BZIP2;
1.39 @@ -1592,7 +1592,7 @@
1.40 Index: rpmio/macro.c
1.41 --- rpmio/macro.c 15 May 2003 13:42:01 -0000 1.1.1.7
1.42 +++ rpmio/macro.c 22 Jan 2004 21:42:32 -0000 1.2
1.43 -@@ -1329,7 +1337,7 @@
1.44 +@@ -1332,7 +1337,7 @@
1.45 STREQ("error", f, fn)) {
1.46 int waserror = 0;
1.47 if (STREQ("error", f, fn))
