X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-php-macros.patch;h=b66cc7ebd124b83a7d69c92e7f9ac2f83539aa81;hb=f5f4004c4c8eeb0f338fa3e53b9a82c18faa0add;hp=20b8668fc6f96c5ed0085632beaff30be254986a;hpb=37e965e83af05766c7487c942385dc8ce496fcb0;p=packages%2Frpm.git

diff --git a/rpm-php-macros.patch b/rpm-php-macros.patch
index 20b8668..b66cc7e 100644
--- a/rpm-php-macros.patch
+++ b/rpm-php-macros.patch
@@ -8,16 +8,21 @@
      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 @@
+--- rpm-5.4.10/macros/php.in	2012-09-05 18:12:29.474278958 +0200
++++ rpm-5.4.15/macros/php.in	2015-09-03 11:16:04.928898067 +0300
+@@ -5,12 +5,9 @@
+-%__php		@__PHP@
+-
+ # Path to scripts to autogenerate php package dependencies,
+ #
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
  # 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_pear_dir	%{_datadir}/pear
 +%__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