- make sure internal glob is used (in form of patch)

Changed files:
    rpm.spec -> 1.800

diff --git a/rpm.spec b/rpm.spec
index 22d0d4915d6834d3f9bf6dc94ef4382fb2591d21..c1397bdd5eb132470db8ac87a86094f3e8ecc744 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -83,7 +83,7 @@ Patch21:      %{name}-dontneedutils.patch
 Patch22:       %{name}-provides-dont-obsolete.patch
 Patch23:       %{name}-pkgconfigdeps.patch
 Patch24:       %{name}-po.patch
-
+Patch25:       %{name}-glob.patch
 Patch26:       %{name}-notsc.patch
 Patch27:       %{name}-hack-norpmlibdep.patch
 Patch28:       %{name}-makefile-no_myLDADD_deps.patch
@@ -663,6 +663,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
@@ -732,8 +733,6 @@ cd ..
 # rpm checks for CPU type at runtime, but it looks better
 sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu@|%{_target_cpu}|' macros.in
 
-CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
-
 # pass CC and CXX too in case of building with some older configure macro
 # disable perl-RPM2 build, we have it in separate spec
 %configure \