- obsolete

[packages/rpm.git] / rpm-glob.patch

diff --git a/rpm-glob.patch b/rpm-glob.patch
index de3ab06a094e226d0a98c976b6f04a1d9b06bf33..87ee587d449ecbef370ca0184a7f6af4f81aeee6 100644 (file)
--- a/rpm-glob.patch
+++ b/rpm-glob.patch
@@ -1,50 +1,37 @@
---- rpm-4.0.2/lib/misc.c.glob  Wed May 16 13:00:10 2001
-+++ rpm-4.0.2/lib/misc.c       Wed May 16 15:35:28 2001
-@@ -583,6 +583,11 @@
-     const char * path;
-     const char * globURL;
-     char * globRoot = NULL;
-+#ifdef ENABLE_NLS     
-+      char * old_collate = NULL;
-+      char * old_ctype = NULL;
-+      char * t;
-+#endif
-     size_t maxb, nb;
-     glob_t gl;
-     int ut;
-@@ -593,6 +598,17 @@
-     if (rc)
-       return rc;
+diff -urN rpm-4.4.8.org/configure.ac rpm-4.4.8/configure.ac
+--- rpm-4.4.8.org/configure.ac 2007-02-11 03:21:02.000000000 +0100
++++ rpm-4.4.8/configure.ac     2007-04-10 18:00:13.715685518 +0200
+@@ -81,6 +81,8 @@
+ AC_PATH_PROG(CTAGS, ctags, /bin/true)
+ AC_PATH_PROG(CSCOPE, cscope, /bin/true)
  
-+#ifdef ENABLE_NLS
-+      t = setlocale(LC_COLLATE, NULL);
-+      if (t)
-+              old_collate = strdup(t);
-+      t = setlocale(LC_CTYPE, NULL);
-+      if (t)
-+              old_ctype = strdup(t);
-+      setlocale(LC_COLLATE, "C");
-+      setlocale(LC_CTYPE, "C");
-+#endif
-+      
-     for (j = 0; j < ac; j++) {
-       if (!myGlobPatternP(av[j])) {
-           if (argc == 0)
-@@ -667,6 +683,17 @@
- 
- 
- exit:
-+#ifdef ENABLE_NLS
-+      if (old_collate) {
-+              setlocale(LC_COLLATE, old_collate);
-+              free(old_collate);
-+      }
-+      if (old_ctype) {
-+              setlocale(LC_CTYPE, old_ctype);
-+              free(old_ctype);
-+      }
-+#endif
++CPPFLAGS="$CPPFLAGS -Dglob=rpm_glob -Dglobfree=rpm_globfree -Dglob64=rpm_glob64 -Dglobfree64=rpm_globfree64"
 +
-     if (av)
-       free((void *)av);
-     if ((rc || argvPtr == NULL) && argv) {
+ dnl
+ dnl This now uses libtool. Put
+ dnl   LDFLAGS_STATIC="-all"
+diff -urN rpm-4.4.8.org/rpmio/librpmio.vers rpm-4.4.8/rpmio/librpmio.vers
+--- rpm-4.4.8.org/rpmio/librpmio.vers  2007-02-02 02:36:47.000000000 +0100
++++ rpm-4.4.8/rpmio/librpmio.vers      2007-04-10 17:59:13.905039270 +0200
+@@ -79,10 +79,8 @@
+     Fwrite;
+     gidToGname;
+     Glob;
+-    glob64;
+     Glob_error;
+     Globfree;
+-    globfree64;
+     Glob_pattern_p;
+     gnameToGid;
+     gzdio;
+@@ -164,6 +162,10 @@
+     rpmGetPath;
+     rpmGlob;
+     rpmGlobalMacroContext;
++    rpm_glob;
++    rpm_glob64;
++    rpm_globfree;
++    rpm_globfree64;
+     rpmhookArgsFree;
+     rpmhookArgsNew;
+     rpmhookCall;