[php/f16] provide php(language), define %{php_version}
Remi Collet
remi at fedoraproject.org
Mon Jul 2 16:31:30 UTC 2012
commit 782def8d16989fcf438afe3f9549d218e2fa45e1
Author: remi <fedora at famillecollet.com>
Date: Mon Jul 2 18:31:25 2012 +0200
provide php(language), define %{php_version}
macros.php | 3 ++-
php.spec | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/macros.php b/macros.php
index 9f5e849..6427f70 100644
--- a/macros.php
+++ b/macros.php
@@ -3,6 +3,7 @@
#
%php_core_api @PHP_APIVER@
%php_zend_api @PHP_ZENDVER@
-%php_pdo_api @PHP_PDOVER@
+%php_pdo_api @PHP_PDOVER@
+%php_version @PHP_VERSION@
%php_extdir %{_libdir}/php/modules
diff --git a/php.spec b/php.spec
index cddad31..d203157 100644
--- a/php.spec
+++ b/php.spec
@@ -38,7 +38,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.3.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: PHP
Group: Development/Languages
URL: http://www.php.net/
@@ -156,6 +156,7 @@ Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver}
# New 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(language) = %{version}, php(language)%{?_isa} = %{version}
# Provides for all builtin/shared modules:
Provides: php-bz2, php-bz2%{?_isa}
Provides: php-calendar, php-calendar%{?_isa}
@@ -985,6 +986,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
-e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \
-e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \
+ -e "s/@PHP_VERSION@/%{version}/" \
< %{SOURCE3} > macros.php
install -m 644 -c macros.php \
$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php
@@ -1112,6 +1114,10 @@ fi
%changelog
+* Mon Jul 02 2012 Remi Collet <remi at fedoraproject.org> 5.3.14-2
+- provide php(language) to allow version check
+- define %%{php_version}
+
* Thu Jun 21 2012 Remi Collet <remi at fedoraproject.org> 5.3.14-1
- update to 5.3.14 (CVE-2012-2143, CVE-2012-2386)
- add missing provides (core, ereg, filter, standard)
More information about the scm-commits
mailing list