- workflow to process also provides

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

diff --git a/rpm-glob.patch b/rpm-glob.patch
index 87ee587d449ecbef370ca0184a7f6af4f81aeee6..1138f2c31782888bbf230d3505f8f59c81664628 100644 (file)
--- a/rpm-glob.patch
+++ b/rpm-glob.patch
@@ -1,37 +1,48 @@
-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)
+--- rpm-5.1.4/rpmio/rpmrpc.c.org       2008-07-29 21:27:42.203871384 +0200
++++ rpm-5.1.4/rpmio/rpmrpc.c   2008-07-29 21:27:58.080756454 +0200
+@@ -1757,14 +1757,14 @@
+       return -2;
+       /*@notreached@*/ break;
+     }
+-    return glob(pattern, flags, errfunc, pglob);
++    return rpm_glob(pattern, flags, errfunc, pglob);
+ }
  
-+CPPFLAGS="$CPPFLAGS -Dglob=rpm_glob -Dglobfree=rpm_globfree -Dglob64=rpm_glob64 -Dglobfree64=rpm_globfree64"
-+
- 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;
+ void Globfree(glob_t *pglob)
+ {
+ if (_rpmio_debug)
+ fprintf(stderr, "*** Globfree(%p)\n", pglob);
+-    globfree(pglob);
++    rpm_globfree(pglob);
+ }
+ 
+ DIR * Opendir(const char * path)
+--- rpm-5.1.4/misc/librpmmisc.c.org    2008-07-29 21:26:19.710540550 +0200
++++ rpm-5.1.4/misc/librpmmisc.c        2008-07-29 21:27:25.357426308 +0200
+@@ -71,7 +71,11 @@
+ #include "fnmatch.h"
+ #include "fnmatch.c"
+ #ifndef __CYGWIN__
++#define       glob            rpm_glob
++#define       globfree        rpm_globfree
+ #include "glob.h"
+ #include "glob.c"
++#undef glob
++#undef globfree
+ #endif
+ 
+--- rpm/misc/librpmmisc.vers~  2007-11-13 03:16:23.000000000 +0100
++++ rpm/misc/librpmmisc.vers   2008-07-29 21:32:35.023645681 +0200
+@@ -7,8 +7,10 @@
+     db_strerror_rpmdb;
+     db_create_rpmdb;
+     fnmatch;
+-    glob;
+-    globfree;
 +    rpm_glob;
 +    rpm_glob64;
 +    rpm_globfree;
 +    rpm_globfree64;
-     rpmhookArgsFree;
-     rpmhookArgsNew;
-     rpmhookCall;
+     lua*;
+     magic_*;
+     rpmz_*;