- added rpm-double_check_unpackaged_subdirs patch (do a strict check when Bloom filte...

[packages/rpm.git] / rpm-php-macros.patch

diff --git a/rpm-php-macros.patch b/rpm-php-macros.patch
index 2a314d043bfb32b9f731725df2d52772e48ecf5e..20b8668fc6f96c5ed0085632beaff30be254986a 100644 (file)
--- a/rpm-php-macros.patch
+++ b/rpm-php-macros.patch
@@ -1,11 +1,23 @@
---- rpm-4.0.4/configure.ac.wiget       Tue Feb 12 23:26:36 2002
-+++ rpm-4.0.4/configure.ac     Tue Feb 12 23:27:46 2002
-@@ -1314,6 +1314,7 @@
-     rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
-     scripts/Makefile scripts/macros.perl scripts/macros.php
+--- rpm-5.3.1/configure.ac.wiget       2010-05-30 16:43:06.000000000 +0200
++++ rpm-5.3.1/configure.ac     2010-05-30 16:43:38.482725491 +0200
+@@ -2199,6 +2199,7 @@ AC_CONFIG_FILES([ po/Makefile.in
+     tools/Makefile
+     scripts/Makefile
      scripts/perl.req scripts/perl.prov
 +    scripts/php.req scripts/php.prov
-     scripts/macros.python tools/Makefile misc/Makefile doc/Makefile
-     doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
-     doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile
-
+     rpmdb/DB_CONFIG
+     macros/macros macros/macros.rpmbuild
+     macros/java macros/libtool macros/mono macros/perl 
+--- rpm-5.4.10/macros/php.in~  2010-10-16 05:38:31.000000000 +0200
++++ rpm-5.4.10/macros/php.in   2012-09-05 18:12:29.474278958 +0200
+@@ -10,7 +10,8 @@
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ #%__php_provides      %{_rpmhome}/phpdeps.sh --provides
+ #%__php_requires      %{_rpmhome}/phpdeps.sh --requires
+-#%__php_provides              %{_rpmhome}/php.prov
+-#%__php_requires              %{_rpmhome}/php.req
++%__php_provides               %{_rpmhome}/php.prov
++# define 'php_req_new' in ~/.rpmmacros to use php version of req finder
++%__php_requires               env PHP_MIN_VERSION=%{?php_min_version} %{_rpmhome}/php.req%{?php_req_new:.php}
+ 
+ %php_pear_dir %{_datadir}/pear