mod_php configuration fixed

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 35d23aa1194da3a8dce4964e75c1b2c180eb4132..fefb54de55b507c45c70b1540ff54da07cc022d9 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -6,8 +6,6 @@
 # - update imap myrights patch (needs api porting)
 # --with-libmbfl=DIR      MBSTRING: Use external libmbfl.  DIR is the libmbfl base install directory BUNDLED
 # --with-onig=DIR         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
-# UNPACKAGED EXTENSION NOTES:
-# - com_dotnet is Win32-only
 # TODO:
 # - fileinfo extension bundles magic db in library: data_file.c (dump of magic.mgc) is 14M
 #   - 2.3M fileinfo.so php54-fileinfo-5.4.6-0.15.x86_64
@@ -136,8 +134,6 @@
 %undefine      with_filter
 %endif
 
-%define                rel     3
-%define                subver  RC7
 %define                orgname php
 %define                ver_suffix 70
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -148,17 +144,16 @@ Summary(pt_BR.UTF-8):     A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       7.0.0
-Release:       %{rel}.%{subver}
+Version:       7.0.1
+Release:       2
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
-#Source0:      http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-Source0:       https://downloads.php.net/~ab/php-%{version}%{subver}.tar.xz
-# Source0-md5: 5bb4e6b8bf969d2bd5ab222c60c52dad
+Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
+# Source0-md5: 23aba67d57d53145becacb982ed498d5
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -1925,12 +1920,7 @@ compression support to PHP.
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%if 1
-%setup -q -n %{orgname}-%{version}%{?subver}
-%else
-%setup -qc -n %{orgname}-%{version}
-mv php-src-*/* .
-%endif
+%setup -q -n %{orgname}-%{version}
 cp -p php.ini-production php.ini
 %patch0 -p1
 %patch1 -p1
@@ -2008,6 +1998,9 @@ sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
+# com_dotnet is Win32-only
+%{__rm} -r ext/com_dotnet
+
 # conflict seems to be resolved by recode patches
 %{__rm} ext/recode/config9.m4