Updated patches to rpm 5.4.10

diff --git a/openmp.patch b/openmp.patch
index 25eebdc7fbe4ad37eb87d1b524b6f61202d610a4..78b02eaec837e10834420e3c57a246cadfb2e562 100644 (file)
--- a/openmp.patch
+++ b/openmp.patch
@@ -1,13 +1,13 @@
 --- rpm-5.3.1/rpmio/Makefile.am.wiget  2010-05-24 17:23:09.000000000 +0200
 +++ rpm-5.3.1/rpmio/Makefile.am        2010-06-01 21:29:20.521227268 +0200
 @@ -102,7 +102,7 @@ librpmio_la_SOURCES = \
-       rpmsq.c rpmsql.c rpmsquirrel.c rpmssl.c rpmsyck.c rpmsw.c rpmsx.c \
-       rpmtcl.c rpmuuid.c rpmxar.c rpmzlog.c rpmzq.c \
-       strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
+       xzdio.c \
+       yarn.c
+ 
 -librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
 +librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION) $(OPENMP_CFLAGS)
  if HAVE_LD_VERSION_SCRIPT
- librpmio_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmio.vers
+ librpmio_la_LDFLAGS += -Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/rpmio/librpmio.vers
  endif
 --- rpm-5.3.1/tools/Makefile.am.wiget  2010-06-01 21:49:05.274449585 +0200
 +++ rpm-5.3.1/tools/Makefile.am        2010-06-01 21:49:56.576943304 +0200

diff --git a/rpm-configure-autoconf.patch b/rpm-configure-autoconf.patch
index 080a09da984d581b8b534d22bbbe80aec3f002f0..5b2bf1cf93285591b2fdd49c700fbad3a52311b7 100644 (file)
--- a/rpm-configure-autoconf.patch
+++ b/rpm-configure-autoconf.patch
@@ -4,8 +4,8 @@
  
  AC_PREREQ(2.63)
  m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel@rpm5.org])
--AC_INIT([rpm],[5.3.11],[PACKAGE_BUGREPORT_DEFAULT])
-+AC_INIT([rpm],[5.3.11],PACKAGE_BUGREPORT_DEFAULT)
- PACKAGE_TIMESTAMP="2011-05-02" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
+-AC_INIT([rpm],[5.4.10],[PACKAGE_BUGREPORT_DEFAULT])
++AC_INIT([rpm],[5.4.10],PACKAGE_BUGREPORT_DEFAULT)
+ PACKAGE_TIMESTAMP="2012-07-06" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
  AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
  

diff --git a/rpm-gettext-in-header.patch b/rpm-gettext-in-header.patch
index 9e3ff96810310789337e83ee82f1ad0f42c3a389..935f6124b4649e1e4bab1c235034e03c5ec560ff 100644 (file)
--- a/rpm-gettext-in-header.patch
+++ b/rpm-gettext-in-header.patch
@@ -1,12 +1,12 @@
 --- rpm-4.1/rpmdb/header.c.wiget2      Thu Sep 19 00:47:29 2002
 +++ rpm-4.1/rpmdb/header.c     Thu Sep 19 00:52:10 2002
 @@ -1645,7 +1645,8 @@
+       if (ed_weak) return (char *) ed_weak;
      }
- /*@=boundsread@*/
  
--    return entry->data;
+-    return (char *) entry->data;
 +/* when everything fail, try gettext */
-+    return ((entry->data != NULL) && *(char*)(entry->data)) ? _(entry->data) : entry->data;
++    return ((entry->data != NULL) && *(char*)(entry->data)) ? _(entry->data) : (char *) entry->data;
  }
  
  /**

diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch
index 95d5158ce68fc7e47bf70dca34de00747e86d29c..1e595010aadbf8af26a3d7f4b313125e801b6608 100644 (file)
--- a/rpm-old-fileconflicts-behaviour.patch
+++ b/rpm-old-fileconflicts-behaviour.patch
@@ -4,8 +4,8 @@
  /*@-fullinitblock@*/
  /*@unchecked@*/
  struct rpmQVKArguments_s rpmIArgs = {
--#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OPENMAMBA) /* dont-filter-install-file-conflicts */
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OPENMAMBA) || defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */
+-#if defined(RPM_VENDOR_MANDRIVA) /* dont-filter-install-file-conflicts */
++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */
      .probFilter = RPMPROB_FILTER_NONE,
  #else
      .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),