do not define __php and php_pear_dir, those are defined by macros.build

diff --git a/rpm-php-macros.patch b/rpm-php-macros.patch
index 20b8668fc6f96c5ed0085632beaff30be254986a..b66cc7ebd124b83a7d69c92e7f9ac2f83539aa81 100644 (file)
--- 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

diff --git a/rpm.spec b/rpm.spec
index f13c45ed44c82528390f7bb061b7353a9a1d53a7..5a69ebacfd60e73ae7073a74694dc15cb55bd047 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15
-Release:       22
+Release:       23
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm