drop cc/cxx/cpp hack

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

diff --git a/rpm-php-macros.patch b/rpm-php-macros.patch
index e16dc36d89089133633a8e899d75de20e1e777d0..b66cc7ebd124b83a7d69c92e7f9ac2f83539aa81 100644 (file)
--- a/rpm-php-macros.patch
+++ b/rpm-php-macros.patch
@@ -8,3 +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   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}