[packages/rpm] Updated patches to rpm 5.4.10

[baggins]

commit 205a62c53719ed4610b33851935a9013cb10b261
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jul 18 22:08:45 2012 +0200

    Updated patches to rpm 5.4.10

 openmp.patch                          | 8 ++++----
 rpm-configure-autoconf.patch          | 6 +++---
 rpm-gettext-in-header.patch           | 6 +++---
 rpm-old-fileconflicts-behaviour.patch | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/openmp.patch b/openmp.patch
index 25eebdc..78b02ea 100644
--- 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, at LD_VERSION_SCRIPT_FLAG@, at 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 080a09d..5b2bf1c 100644
--- 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 at 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 9e3ff96..935f612 100644
--- 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 95d5158..1e59501 100644
--- 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),