also provide php(language)%{_isa}, define %{php_version}

This commit is contained in:
remi 2012-07-02 17:50:55 +02:00
parent 3d5a774764
commit 73d6fede70
2 changed files with 8 additions and 2 deletions

View File

@ -4,6 +4,7 @@
%php_core_api @PHP_APIVER@ %php_core_api @PHP_APIVER@
%php_zend_api @PHP_ZENDVER@ %php_zend_api @PHP_ZENDVER@
%php_pdo_api @PHP_PDOVER@ %php_pdo_api @PHP_PDOVER@
%php_version @PHP_VERSION@
%php_extdir %{_libdir}/php/modules %php_extdir %{_libdir}/php/modules
%php_ztsextdir %{_libdir}/php-zts/modules %php_ztsextdir %{_libdir}/php-zts/modules

View File

@ -56,7 +56,7 @@
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
Name: php Name: php
Version: 5.4.4 Version: 5.4.4
Release: 3%{?dist} Release: 4%{?dist}
License: PHP License: PHP
Group: Development/Languages Group: Development/Languages
URL: http://www.php.net/ URL: http://www.php.net/
@ -180,7 +180,7 @@ Summary: Common files for PHP
# ABI/API check - Arch specific # ABI/API check - Arch specific
Provides: php-api = %{apiver}%{isasuffix}, php-zend-abi = %{zendver}%{isasuffix} Provides: php-api = %{apiver}%{isasuffix}, php-zend-abi = %{zendver}%{isasuffix}
Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffix} Provides: php(api) = %{apiver}%{isasuffix}, php(zend-abi) = %{zendver}%{isasuffix}
Provides: php(language) = %{version} Provides: php(language) = %{version}, php(language)%{?_isa} = %{version}
# Provides for all builtin/shared modules: # Provides for all builtin/shared modules:
Provides: php-bz2, php-bz2%{?_isa} Provides: php-bz2, php-bz2%{?_isa}
Provides: php-calendar, php-calendar%{?_isa} Provides: php-calendar, php-calendar%{?_isa}
@ -1119,6 +1119,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \ sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
-e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \ -e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \
-e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \ -e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \
-e "s/@PHP_VERSION@/%{version}/" \
< %{SOURCE3} > macros.php < %{SOURCE3} > macros.php
install -m 644 -c macros.php \ install -m 644 -c macros.php \
$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php
@ -1282,6 +1283,10 @@ fi
%changelog %changelog
* Mon Jul 02 2012 Remi Collet <remi@fedoraproject.org> 5.4.4-4
- also provide php(language)%%{_isa}
- define %%{php_version}
* Mon Jul 02 2012 Remi Collet <remi@fedoraproject.org> 5.4.4-3 * Mon Jul 02 2012 Remi Collet <remi@fedoraproject.org> 5.4.4-3
- drop BR for libevent (#835671) - drop BR for libevent (#835671)
- provide php(language) to allow version check - provide php(language) to allow version check