Open Build Service

Changes of Revision 2

php5.changes Changed

php5.spec Changed

@@ -26,19 +26,19 @@
 %define with_spell 1
 
 BuildRequires:  libopenssl-1_0_0-devel
-BuildRequires:  libcurl-openssl_1_0_0-devel   
-BuildRequires:  imap-openssl_1_0_0-devel        
- 
+BuildRequires:  libcurl-openssl_1_0_0-devel
+BuildRequires:  imap-openssl_1_0_0-devel
+
 BuildRequires:  apache2-devel
 BuildRequires:  autoconf
 BuildRequires:  bison
 BuildRequires:  curl-openssl_1_0_0-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  db-devel
-%if 0%{sle_version} >= 150200 && 0%{?is_opensuse} 
+%if 0%{sle_version} >= 150200 && 0%{?is_opensuse}
 BuildRequires:  enchant-1-devel
 %endif
-%if 0%{sle_version} <= 150100 && 0%{?is_opensuse} 
+%if 0%{sle_version} <= 150100 && 0%{?is_opensuse}
 BuildRequires:  enchant-devel
 %endif
 BuildRequires:  freetype2-devel
@@ -47,10 +47,10 @@
 BuildRequires:  krb5-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libevent-devel
-%if 0%{sle_version} >= 150200 && 0%{?is_opensuse} 
+%if 0%{sle_version} >= 150200 && 0%{?is_opensuse}
 BuildRequires:  libicu60-devel
 %endif
-%if 0%{sle_version} <= 150100 && 0%{?is_opensuse} 
+%if 0%{sle_version} <= 150100 && 0%{?is_opensuse}
 BuildRequires:  libicu-devel
 %endif
 BuildRequires:  libmcrypt-devel
@@ -65,7 +65,7 @@
 BuildRequires:  pkgconfig
 BuildRequires:  postfix
 BuildRequires:  postgresql10-openssl_1_0_0-devel
-%if 0%{sle_version} >= 150200 && 0%{?is_opensuse} 
+%if 0%{sle_version} >= 150200 && 0%{?is_opensuse}
 BuildRequires:  postgresql-openssl_1_0_0-devel
 BuildRequires:  postgresql-openssl_1_0_0
 %endif
@@ -797,7 +797,7 @@
 --------
     The PHP Group
     See http://www.php.net/credits.php for more details
-    
+
 %package firebird
 Provides:       php5-interbase = %{version}
 Provides:       php5-pdo_firebird = %{version}
@@ -1664,11 +1664,22 @@
     fi
     ext=${f##*/}
     extern_modules="$extern_modules $ext"
-    echo "; comment out next line to disable $ext extension in php" > %{buildroot}/%{php_sysconf}/conf.d/$ext.ini
-    echo "extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/$ext.ini
+    case $ext in
+      # priority 0 (will be loaded first)
+      opcache|mysqlnd)
+        ini_name=00-${ext};;
+      # priority 2 (will be loaded after < 2)
+      pdo_*|mysqli|xmlreader)
+        ini_name=20-${ext};;
+      # priority 1 (will be loaded after < 1)
+      *)
+        ini_name=10-${ext};;
+    esac
+    echo "; comment out next line to disable $ext extension in php" > %{buildroot}/%{php_sysconf}/conf.d/${ini_name}.ini
+    echo "extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/${ini_name}.ini
 done
 #suhosin configuration
-%{__install} -m 644 ext/suhosin/suhosin.ini %{buildroot}/%{php_sysconf}/conf.d/suhosin.ini
+%{__install} -m 644 ext/suhosin/suhosin.ini %{buildroot}/%{php_sysconf}/conf.d/*suhosin.ini
 # list of builtin modules
 builtin_modules=`./build-cli/sapi/cli/php -m | egrep -v '^(\.*)?$' | sort | tr '\n' ' '`
 # update readme
@@ -1796,281 +1807,281 @@
 %files bcmath
 %defattr(644,root,root,755)
 %{extension_dir}/bcmath.so
-%config(noreplace) %{php_sysconf}/conf.d/bcmath.ini
+%config(noreplace) %{php_sysconf}/conf.d/*bcmath.ini
 
 %files bz2
 %defattr(644,root,root,755)
 %{extension_dir}/bz2.so
-%config(noreplace) %{php_sysconf}/conf.d/bz2.ini
+%config(noreplace) %{php_sysconf}/conf.d/*bz2.ini
 
 %files calendar
 %defattr(644,root,root,755)
 %{extension_dir}/calendar.so
-%config(noreplace) %{php_sysconf}/conf.d/calendar.ini
+%config(noreplace) %{php_sysconf}/conf.d/*calendar.ini
 
 %files ctype
 %defattr(644,root,root,755)
 %{extension_dir}/ctype.so
-%config(noreplace) %{php_sysconf}/conf.d/ctype.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ctype.ini
 
 %files curl
 %defattr(644,root,root,755)
 %{extension_dir}/curl.so
-%config(noreplace) %{php_sysconf}/conf.d/curl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*curl.ini
 
 %files dba
 %defattr(644,root,root,755)
 %{extension_dir}/dba.so
-%config(noreplace) %{php_sysconf}/conf.d/dba.ini
+%config(noreplace) %{php_sysconf}/conf.d/*dba.ini
 
 %files dom
 %defattr(644,root,root,755)
 %{extension_dir}/dom.so
-%config(noreplace) %{php_sysconf}/conf.d/dom.ini
+%config(noreplace) %{php_sysconf}/conf.d/*dom.ini
 
 %files enchant
 %defattr(644,root,root,755)
 %{extension_dir}/enchant.so
-%config(noreplace) %{php_sysconf}/conf.d/enchant.ini
+%config(noreplace) %{php_sysconf}/conf.d/*enchant.ini
 
 %files exif
 %defattr(644,root,root,755)
 %{extension_dir}/exif.so
-%config(noreplace) %{php_sysconf}/conf.d/exif.ini
+%config(noreplace) %{php_sysconf}/conf.d/*exif.ini
 
 %files fileinfo
 %defattr(644,root,root,755)
 %{extension_dir}/fileinfo.so
-%config(noreplace) %{php_sysconf}/conf.d/fileinfo.ini
+%config(noreplace) %{php_sysconf}/conf.d/*fileinfo.ini
 
 %files ftp
 %defattr(644,root,root,755)
 %{extension_dir}/ftp.so
-%config(noreplace) %{php_sysconf}/conf.d/ftp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ftp.ini
 
 %files gd
 %defattr(644,root,root,755)
 %{extension_dir}/gd.so
-%config(noreplace) %{php_sysconf}/conf.d/gd.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gd.ini
 
 %files gettext
 %defattr(644,root,root,755)
 %{extension_dir}/gettext.so
-%config(noreplace) %{php_sysconf}/conf.d/gettext.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gettext.ini
 
 %files gmp
 %defattr(644,root,root,755)
 %{extension_dir}/gmp.so
-%config(noreplace) %{php_sysconf}/conf.d/gmp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gmp.ini
 
 %files iconv
 %defattr(644,root,root,755)
 %{extension_dir}/iconv.so
-%config(noreplace) %{php_sysconf}/conf.d/iconv.ini
+%config(noreplace) %{php_sysconf}/conf.d/*iconv.ini
 
 %files imap
 %defattr(644,root,root,755)
 %{extension_dir}/imap.so
-%config(noreplace) %{php_sysconf}/conf.d/imap.ini
+%config(noreplace) %{php_sysconf}/conf.d/*imap.ini
 
 %files intl
 %defattr(644,root,root,755)
 %{extension_dir}/intl.so
-%config(noreplace) %{php_sysconf}/conf.d/intl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*intl.ini
 
 %files json
 %defattr(644,root,root,755)
 %{extension_dir}/json.so
-%config(noreplace) %{php_sysconf}/conf.d/json.ini
+%config(noreplace) %{php_sysconf}/conf.d/*json.ini
 
 %files ldap
 %defattr(644,root,root,755)
 %{extension_dir}/ldap.so
-%config(noreplace) %{php_sysconf}/conf.d/ldap.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ldap.ini
 
 %files mbstring
 %defattr(644,root,root,755)
 %{extension_dir}/mbstring.so
-%config(noreplace) %{php_sysconf}/conf.d/mbstring.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mbstring.ini
 
 %files mcrypt
 %defattr(644,root,root,755)
 %{extension_dir}/mcrypt.so
-%config(noreplace) %{php_sysconf}/conf.d/mcrypt.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mcrypt.ini
 
 %if 0%{suse_version} > 1110
 
 %files mssql
 %defattr(644,root,root,755)
 %{extension_dir}/mssql.so
-%config(noreplace) %{php_sysconf}/conf.d/mssql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mssql.ini
 
 %endif
 
 %files mysql
 %defattr(644,root,root,755)
 %{extension_dir}/mysql.so
-%config(noreplace) %{php_sysconf}/conf.d/mysql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mysql.ini
 %{extension_dir}/mysqli.so
-%config(noreplace) %{php_sysconf}/conf.d/mysqli.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mysqli.ini
 %{extension_dir}/pdo_mysql.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_mysql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_mysql.ini
 
 %files firebird
 %defattr(644,root,root,755)
 %{extension_dir}/interbase.so
-%config(noreplace) %{php_sysconf}/conf.d/interbase.ini
+%config(noreplace) %{php_sysconf}/conf.d/*interbase.ini
 %{extension_dir}/pdo_firebird.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_firebird.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_firebird.ini
 
 %files odbc
 %defattr(644,root,root,755)
 %{extension_dir}/odbc.so
-%config(noreplace) %{php_sysconf}/conf.d/odbc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*odbc.ini
 %{extension_dir}/pdo_odbc.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_odbc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_odbc.ini
 
 %files openssl
 %defattr(644,root,root,755)
 %{extension_dir}/openssl.so
-%config(noreplace) %{php_sysconf}/conf.d/openssl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*openssl.ini
 
 %files phar
 %defattr(644,root,root,755)
 %{extension_dir}/phar.so
-%config(noreplace) %{php_sysconf}/conf.d/phar.ini
+%config(noreplace) %{php_sysconf}/conf.d/*phar.ini
 %{_bindir}/phar
 %{_bindir}/phar.phar
 
 %files pcntl
 %defattr(644,root,root,755)
 %{extension_dir}/pcntl.so
-%config(noreplace) %{php_sysconf}/conf.d/pcntl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pcntl.ini
 
 %files pdo
 %defattr(644,root,root,755)
 %{extension_dir}/pdo.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo.ini
 
 %files pgsql
 %defattr(644,root,root,755)
 %{extension_dir}/pgsql.so
-%config(noreplace) %{php_sysconf}/conf.d/pgsql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pgsql.ini
 %{extension_dir}/pdo_pgsql.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_pgsql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_pgsql.ini
 
 %files posix
 %defattr(644,root,root,755)
 %{extension_dir}/posix.so
-%config(noreplace) %{php_sysconf}/conf.d/posix.ini
+%config(noreplace) %{php_sysconf}/conf.d/*posix.ini
 %if %{with_spell}
 
 %files pspell
 %defattr(644,root,root,755)
 %{extension_dir}/pspell.so
-%config(noreplace) %{php_sysconf}/conf.d/pspell.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pspell.ini
 %endif
 
 %files readline
 %defattr(644,root,root,755)
 %{extension_dir}/readline.so
-%config(noreplace) %{php_sysconf}/conf.d/readline.ini
+%config(noreplace) %{php_sysconf}/conf.d/*readline.ini
 
 %files shmop
 %defattr(644,root,root,755)
 %{extension_dir}/shmop.so
-%config(noreplace) %{php_sysconf}/conf.d/shmop.ini
+%config(noreplace) %{php_sysconf}/conf.d/*shmop.ini
 
 %if "" == "yes"
 %files snmp
 %defattr(644,root,root,755)
 %{extension_dir}/snmp.so
-%config(noreplace) %{php_sysconf}/conf.d/snmp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*snmp.ini
 %endif
 
 %files soap
 %defattr(644,root,root,755)
 %{extension_dir}/soap.so
-%config(noreplace) %{php_sysconf}/conf.d/soap.ini
+%config(noreplace) %{php_sysconf}/conf.d/*soap.ini
 
 %files sockets
 %defattr(644,root,root,755)
 %{extension_dir}/sockets.so
-%config(noreplace) %{php_sysconf}/conf.d/sockets.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sockets.ini
 
 %files sqlite
 %defattr(644,root,root,755)
 %{extension_dir}/sqlite.so
-%config(noreplace) %{php_sysconf}/conf.d/sqlite.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sqlite.ini
 %{extension_dir}/pdo_sqlite.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_sqlite.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_sqlite.ini
 %{extension_dir}/sqlite3.so
-%config(noreplace) %{php_sysconf}/conf.d/sqlite3.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sqlite3.ini
 
 %files suhosin
 %defattr(644,root,root,755)
 %{extension_dir}/suhosin.so
-%config(noreplace) %{php_sysconf}/conf.d/suhosin.ini
+%config(noreplace) %{php_sysconf}/conf.d/*suhosin.ini
 
 %files sysvmsg
 %defattr(644,root,root,755)
 %{extension_dir}/sysvmsg.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvmsg.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvmsg.ini
 
 %files sysvsem
 %defattr(644,root,root,755)
 %{extension_dir}/sysvsem.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvsem.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvsem.ini
 
 %files sysvshm
 %defattr(644,root,root,755)
 %{extension_dir}/sysvshm.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvshm.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvshm.ini
 
 %files tidy
 %defattr(644,root,root,755)
 %{extension_dir}/tidy.so
-%config(noreplace) %{php_sysconf}/conf.d/tidy.ini
+%config(noreplace) %{php_sysconf}/conf.d/*tidy.ini
 
 %files tokenizer
 %defattr(644,root,root,755)
 %{extension_dir}/tokenizer.so
-%config(noreplace) %{php_sysconf}/conf.d/tokenizer.ini
+%config(noreplace) %{php_sysconf}/conf.d/*tokenizer.ini
 
 %files wddx
 %defattr(644,root,root,755)
 %{extension_dir}/wddx.so
-%config(noreplace) %{php_sysconf}/conf.d/wddx.ini
+%config(noreplace) %{php_sysconf}/conf.d/*wddx.ini
 
 %files xmlrpc
 %defattr(644,root,root,755)
 %{extension_dir}/xmlrpc.so
-%config(noreplace) %{php_sysconf}/conf.d/xmlrpc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xmlrpc.ini
 
 %files xmlreader
 %defattr(644,root,root,755)
 %{extension_dir}/xmlreader.so
-%config(noreplace) %{php_sysconf}/conf.d/xmlreader.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xmlreader.ini
 
 %files xmlwriter
 %defattr(644,root,root,755)
 %{extension_dir}/xmlwriter.so
-%config(noreplace) %{php_sysconf}/conf.d/xmlwriter.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xmlwriter.ini
 
 %files xsl
 %defattr(644,root,root,755)
 %{extension_dir}/xsl.so
-%config(noreplace) %{php_sysconf}/conf.d/xsl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xsl.ini
 
 %files zip
 %defattr(644,root,root,755)
 %{extension_dir}/zip.so
-%config(noreplace) %{php_sysconf}/conf.d/zip.ini
+%config(noreplace) %{php_sysconf}/conf.d/*zip.ini
 
 %files zlib
 %defattr(644,root,root,755)
 %{extension_dir}/zlib.so
-%config(noreplace) %{php_sysconf}/conf.d/zlib.ini
+%config(noreplace) %{php_sysconf}/conf.d/*zlib.ini
 
 %changelog
 * Mon Feb 23 2015 jweberhofer@weberhofer.at