- rel 48; force glob() to use lstat now; we can avoid using internal copy now + we...

Changed files:
    rpm.spec -> 1.837.2.42.2.49.2.99

diff --git a/rpm.spec b/rpm.spec
index 6580f56bb75a5d5197965d916d7a09cd24c5b0c0..d342bab06feff08cc7611813f5667cc997483fcd 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -57,7 +57,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.5
-Release:       47
+Release:       48
 License:       LGPL
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
@@ -181,6 +181,7 @@ Patch100:   %{name}-rpm5-debugedit.patch
 Patch101:      %{name}-builddir-readlink.patch
 Patch102:      pythondeps-speedup.patch
 Patch103:      %{name}-lua-exit-chroot-correctly.patch
+Patch104:      %{name}-glob.patch
 URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.4
@@ -811,6 +812,7 @@ install %{SOURCE13} scripts/perl.prov
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 
 mv -f po/{sr,sr@Latn}.po
 rm -rf sqlite zlib popt
@@ -884,7 +886,7 @@ sed -i \
 
 # pass CC and CXX too in case of building with some older configure macro
 # disable perl-RPM2 build, we have it in separate spec
-CPPFLAGS=-I/usr/include/oosp-uuid
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid"
 %configure \
        CC="%{__newcc}" \
        CXX="%{__newcxx}" \