Open Build Service

Changes of Revision 17

php7.spec Changed

@@ -1468,7 +1468,8 @@
       opcache)
         ini_name=00-${ext}
         zend_='zend_';;
-      mysqlnd)
+      # openssl must be loaded before mysqlnd (undefined symbol: RSA_public_encrypt)
+      openssl)
         ini_name=00-${ext};;
       # priority 2 (will be loaded after < 2)
       pdo_*|mysqli|xmlreader)
@@ -1491,10 +1492,6 @@
 # install missing SAPI headers for embed
 install -d %{buildroot}%{_includedir}/%{php_name}/sapi/embed
 install -m 644 sapi/embed/php_embed.h %{buildroot}%{_includedir}/%{php_name}/sapi/embed/php_embed.h
-# openssl must be loaded before mysqlnd (undefined symbol: RSA_public_encrypt)
-mv %{buildroot}%{php_sysconf}/conf.d/{,19-}openssl.ini
-# mysqlnd must be loaded before mysqli (undefined symbol: mysqlnd_global_stats)
-mv %{buildroot}%{php_sysconf}/conf.d/{,20-}mysqlnd.ini
 %endif
 
 %if "%{flavor}" == "apache2"
@@ -1734,7 +1731,7 @@
 %{extension_dir}/mysqli.so
 %config(noreplace) %{php_sysconf}/conf.d/*mysqli.ini
 %{extension_dir}/mysqlnd.so
-%config(noreplace) %{php_sysconf}/conf.d/20-mysqlnd.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mysqlnd.ini
 %{extension_dir}/pdo_mysql.so
 %config(noreplace) %{php_sysconf}/conf.d/*pdo_mysql.ini
 
@@ -1760,7 +1757,7 @@
 %files openssl
 %defattr(-, root, root)
 %{extension_dir}/openssl.so
-%config(noreplace) %{php_sysconf}/conf.d/19-openssl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*openssl.ini
 
 %files phar
 %defattr(-, root, root)