]>
Commit | Line | Data |
---|---|---|
ebe974a8 AF |
1 | --- rpm-5.3.1/configure.ac.wiget 2010-05-30 16:43:06.000000000 +0200 |
2 | +++ rpm-5.3.1/configure.ac 2010-05-30 16:43:38.482725491 +0200 | |
3 | @@ -2199,6 +2199,7 @@ AC_CONFIG_FILES([ po/Makefile.in | |
4 | tools/Makefile | |
5 | scripts/Makefile | |
ca863ddc AM |
6 | scripts/perl.req scripts/perl.prov |
7 | + scripts/php.req scripts/php.prov | |
ebe974a8 AF |
8 | rpmdb/DB_CONFIG |
9 | macros/macros macros/macros.rpmbuild | |
10 | macros/java macros/libtool macros/mono macros/perl | |
c59a5c9d ER |
11 | --- rpm-5.4.10/macros/php.in 2012-09-05 18:12:29.474278958 +0200 |
12 | +++ rpm-5.4.15/macros/php.in 2015-09-03 11:16:04.928898067 +0300 | |
13 | @@ -5,12 +5,9 @@ | |
14 | -%__php @__PHP@ | |
15 | - | |
16 | # Path to scripts to autogenerate php package dependencies, | |
17 | # | |
18 | # Note: Used iff _use_internal_dependency_generator is non-zero. The | |
37e965e8 JR |
19 | # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. |
20 | #%__php_provides %{_rpmhome}/phpdeps.sh --provides | |
21 | #%__php_requires %{_rpmhome}/phpdeps.sh --requires | |
22 | -#%__php_provides %{_rpmhome}/php.prov | |
23 | -#%__php_requires %{_rpmhome}/php.req | |
c59a5c9d ER |
24 | - |
25 | -%php_pear_dir %{_datadir}/pear | |
37e965e8 JR |
26 | +%__php_provides %{_rpmhome}/php.prov |
27 | +# define 'php_req_new' in ~/.rpmmacros to use php version of req finder | |
28 | +%__php_requires env PHP_MIN_VERSION=%{?php_min_version} %{_rpmhome}/php.req%{?php_req_new:.php} |