7.1.5RC1

1 files changed, 17 insertions, 13 deletions

diff --git a/php.spec b/php.spec
index ef731f1..b94b127 100644
--- a/php.spec
+++ b/php.spec
@@ -26,7 +26,7 @@
 %global zendver     20160303
 %global pdover      20150127
 # Extension version
-%global oci8ver     2.1.3
+%global oci8ver     2.1.4
 
 # Adds -z now to the linker flags
 %global _hardened_build 1
@@ -124,14 +124,14 @@
 %global db_devel  libdb-devel
 %endif
 
-#global rcver        RC1
-%global rpmrel       1
+%global upver        7.1.5
+%global rcver        RC1
 
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
-Version: 7.1.4
-Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist}
+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
@@ -144,7 +144,7 @@ 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
+Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
 %endif
 Source1: php.conf
 Source2: php.ini
@@ -862,11 +862,11 @@ support for JavaScript Object Notation (JSON) to PHP.
 
 
 %prep
-: Building %{name}-%{version}-%{release} with systemd=%{with_systemd} imap=%{with_imap} interbase=%{with_interbase} mcrypt=%{with_mcrypt} freetds=%{with_freetds} sqlite3=%{with_sqlite3} tidy=%{with_tidy} zip=%{with_zip}
+: Building %{name}-%{upver}-%{release} with systemd=%{with_systemd} imap=%{with_imap} interbase=%{with_interbase} mcrypt=%{with_mcrypt} freetds=%{with_freetds} sqlite3=%{with_sqlite3} tidy=%{with_tidy} zip=%{with_zip}
 %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
 
 %patch5 -p1 -b .includedir
@@ -943,8 +943,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
@@ -998,7 +998,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}:" \
@@ -1524,8 +1524,8 @@ extension=${mod}.so
 EOF
     fi
     cat > files.${mod} <<EOF
-%attr(755,root,root) %{_libdir}/php/modules/${mod}.so
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/php.d/${ini}
+%{_libdir}/php/modules/${mod}.so
+%config(noreplace) %{_sysconfdir}/php.d/${ini}
 EOF
 done
 
@@ -1813,6 +1813,10 @@ fi
 
 
 %changelog
+* Tue Apr 25 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5~RC1-1
+- Update to 7.1.5RC1
+- oci8 version is now 2.1.4
+
 * Tue Apr 11 2017 Remi Collet <remi@fedoraproject.org> - 7.1.4-1
 - Update to 7.1.4 - http://www.php.net/releases/7_1_4.php