From: Jakub Bogusz Date: Tue, 22 May 2007 17:57:40 +0000 (+0000) Subject: - seems obsolete at last X-Git-Tag: auto/th/rpm-4_4_9-0_1~19 X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=3bcc0bcada13eec095b51f7b55c4fb289c58e5a3;hp=aea84077917d4324a38faeacc0fa86d94d3b8184 - seems obsolete at last Changed files: rpm-glob.patch -> 1.7 --- diff --git a/rpm-glob.patch b/rpm-glob.patch deleted file mode 100644 index 87ee587..0000000 --- a/rpm-glob.patch +++ /dev/null @@ -1,37 +0,0 @@ -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) - -+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; -+ rpm_glob; -+ rpm_glob64; -+ rpm_globfree; -+ rpm_globfree64; - rpmhookArgsFree; - rpmhookArgsNew; - rpmhookCall;