diff options
-rw-r--r-- | php.spec | 32 |
1 files changed, 9 insertions, 23 deletions
@@ -124,23 +124,13 @@ %global db_devel libdb-devel %endif -%global gh_commit c22cda5999eaaaa50df0b7977f51853cbf1988a3 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -#global gh_date 20170828 -%global gh_owner php -%global gh_project php-src -#global rcver RC6 -%global rpmrel 1 - +%global upver 7.2.0 +#global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php -Version: 7.2.0 -%if 0%{?gh_date} -Release: 0.%{rpmrel}.%{gh_date}.%{gh_short}%{?dist} -%else -Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist} -%endif +Version: %{upver}%{?rcver:~%{rcver}} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -150,11 +140,7 @@ License: PHP and Zend and BSD and MIT and ASL 1.0 Group: Development/Languages URL: http://www.php.net/ -%if 0%{?gh_date} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}%{?gh_short:-%{gh_short}}.tar.gz -%else -Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.xz -%endif +Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz Source1: php.conf Source2: php.ini Source3: macros.php @@ -902,7 +888,7 @@ low-level PHP extension for the libsodium cryptographic library. %if 0%{?gh_date} %setup -q -n %{gh_project}-%{gh_commit} %else -%setup -q -n php-%{version}%{?rcver} +%setup -q -n php-%{upver}%{?rcver} %endif %patch1 -p1 -b .mpmcheck @@ -980,8 +966,8 @@ rm Zend/tests/bug68412.phpt # Safety check for API version change. pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h) -if test "x${pver}" != "x%{version}%{?rcver}%{!?rcver:%{?gh_date:-dev}}"; then - : Error: Upstream PHP version is now ${pver}, expecting %{version}%{?rcver}%{!?rcver:%{?gh_date:-dev}}. +if test "x${pver}" != "x%{upver}%{?rcver}%{!?rcver:%{?gh_date:-dev}}"; then + : Error: Upstream PHP version is now ${pver}, expecting %{upver}%{?rcver}%{!?rcver:%{?gh_date:-dev}}. : Update the version/rcver macros and rebuild. exit 1 fi @@ -1035,7 +1021,7 @@ chmod 644 README.* sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \ -e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \ -e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \ - -e "s/@PHP_VERSION@/%{version}/" \ + -e "s/@PHP_VERSION@/%{upver}/" \ -e "s:@LIBDIR@:%{_libdir}:" \ -e "s:@ETCDIR@:%{_sysconfdir}:" \ -e "s:@INCDIR@:%{_includedir}:" \ |