X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-gettext-in-header.patch;h=935f6124b4649e1e4bab1c235034e03c5ec560ff;hb=27c7217eea874a4f898798dc181e80a05b82f0f7;hp=0e2a11e89cd2052b21d13d6dadb7d6fafb6a8ac4;hpb=d2e6b845887432e0307a1b4b1ebff0dd0cf97afa;p=packages%2Frpm.git

diff --git a/rpm-gettext-in-header.patch b/rpm-gettext-in-header.patch
index 0e2a11e..935f612 100644
--- a/rpm-gettext-in-header.patch
+++ b/rpm-gettext-in-header.patch
@@ -1,13 +1,12 @@
---- ./lib/header.c.org	Sun Feb 17 01:50:51 2002
-+++ ./lib/header.c	Sun Feb 17 01:52:01 2002
-@@ -1282,8 +1282,8 @@
- 
- 	}
+--- 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;
      }
--
--    return entry->data;
+ 
+-    return (char *) entry->data;
 +/* when everything fail, try gettext */
-+    return _(entry->data);
++    return ((entry->data != NULL) && *(char*)(entry->data)) ? _(entry->data) : (char *) entry->data;
  }
  
  /**