- removed glob patch, rpm passes test case from

  http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2008-October/020546.html

diff --git a/rpm-glob.patch b/rpm-glob.patch
deleted file mode 100644 (file)
index 189c9e5..0000000
--- a/rpm-glob.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- rpm-4.5/rpmio/rpmrpc.c~    2010-12-19 14:19:57.678043380 +0100
-+++ rpm-4.5/rpmio/rpmrpc.c     2010-12-19 14:20:39.353812967 +0100
-@@ -1711,6 +1711,17 @@
- if (_rpmio_debug)
- fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", pattern, (unsigned)flags, (void *)errfunc, pglob);
- /*@=castfcnptr@*/
-+
-+    /* same as upstream glob with difference that gl_stat is Lstat now */
-+    pglob->gl_closedir = closedir;
-+    pglob->gl_readdir = readdir;
-+    pglob->gl_opendir = opendir;
-+    pglob->gl_lstat = Lstat;
-+    pglob->gl_stat = Lstat;
-+
-+/*@=type@*/
-+      flags |= GLOB_ALTDIRFUNC;
-+
-     switch (ut) {
-     case URL_IS_HTTPS:
-     case URL_IS_HTTP:
---- rpm-4.5/configure.ac~      2010-12-19 13:46:37.917863585 +0100
-+++ rpm-4.5/configure.ac       2010-12-19 13:50:49.826071048 +0100
-@@ -1004,8 +1004,8 @@
- #fi
- #
- #if test "$rpm_cv_glob" = yes; then
--    AC_DEFINE(USE_GNU_GLOB, 1, [Use the included glob.c?])
--    AC_LIBOBJ(glob)
-+#    AC_DEFINE(USE_GNU_GLOB, 1, [Use the included glob.c?])
-+#    AC_LIBOBJ(glob)
-     AC_LIBOBJ(fnmatch)
- #fi
- 
-

diff --git a/rpm.spec b/rpm.spec
index 428ab58a60393f63f0f3c34d99bcc5a370caaf8e..03b7940d6d700338859824c2e8efb371c2fe6e72 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,5 @@
 #
 # TODO:
-# - check if glob() patch needs resurrecting/rewriting
 # - check if we want shell autodeps: Requires: executable(ln) executable(mv)
 # - add macros for some ppc, mipsel, alpha and sparc
 #
@@ -95,7 +94,6 @@ Patch8:               %{name}-gettext-in-header.patch
 Patch9:        %{name}-lua.patch
 Patch10:       %{name}-etc_dir.patch
 Patch11:       %{name}-php-deps.patch
-Patch12:       %{name}-glob.patch
 Patch13:       %{name}-notsc.patch
 Patch14:       %{name}-hack-norpmlibdep.patch
 Patch15:       %{name}-epoch0.patch
@@ -771,8 +769,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-# Maybe, at last we can remove this?
-#patch12 -p1
 %patch23 -p1
 %ifarch sparc64
 %patch24 -p1