diff -r 2289d64c2123 -r 4ecfc2416fd8 openpkg/rpm.patch.feature
--- a/openpkg/rpm.patch.feature	Mon Mar 28 19:41:02 2011 +0200
+++ b/openpkg/rpm.patch.feature	Tue Mar 29 19:46:35 2011 +0200
@@ -968,7 +968,7 @@
 Index: configure.ac
 --- configure.ac	2 Jul 2003 19:20:52 -0000	1.1.1.4
 +++ configure.ac	13 Sep 2006 13:39:12 -0000
-@@ -1200,12 +1202,12 @@
+@@ -1200,12 +1201,12 @@
  AC_SUBST(LOCALEDIR)
  LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
  AC_SUBST(LIBDIR)
@@ -983,7 +983,7 @@
  AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR",
  	[Full path to rpm system configuration directory (usually /etc/rpm)])
  AC_SUBST(SYSCONFIGDIR)
-@@ -1215,17 +1217,17 @@
+@@ -1215,17 +1216,17 @@
  	[Colon separated paths of macro files to read.])
  AC_SUBST(MACROFILES)
  
@@ -1560,7 +1560,7 @@
 Index: rpmio/macro.c
 --- rpmio/macro.c	15 May 2003 13:42:01 -0000	1.1.1.7
 +++ rpmio/macro.c	22 Jan 2004 21:42:32 -0000	1.2
-@@ -1114,9 +1119,11 @@
+@@ -1116,9 +1119,11 @@
  	case 2:	/* COMPRESSED_BZIP2 */
  	    sprintf(be, "%%_bzip2 %s", b);
  	    break;
@@ -1572,7 +1572,7 @@
  	}
  	b = be;
      } else if (STREQ("S", f, fn)) {
-@@ -1717,9 +1725,11 @@
+@@ -1720,9 +1725,11 @@
  
      if ((magic[0] == 'B') && (magic[1] == 'Z')) {
  	*compressed = COMPRESSED_BZIP2;
@@ -1592,7 +1592,7 @@
 Index: rpmio/macro.c
 --- rpmio/macro.c	15 May 2003 13:42:01 -0000	1.1.1.7
 +++ rpmio/macro.c	22 Jan 2004 21:42:32 -0000	1.2
-@@ -1329,7 +1337,7 @@
+@@ -1332,7 +1337,7 @@
  	    STREQ("error", f, fn)) {
  		int waserror = 0;
  		if (STREQ("error", f, fn))