update php-libtool.patch, php-fpm-config.patch

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index dbd931a1f28d53df5e2c35c644487508a0d38c1f..468dafa8405952b16f1d3dac2f96fb86c3fda802 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -70,18 +70,18 @@
  
                        ths = document.getElementsByTagName("th");
                        for (var i=0; i<ths.length; i++) {
---- php7.0-7.0/sapi/fpm/Makefile.frag~ 2015-05-21 17:57:06.000000000 +0300
-+++ php7.0-7.0/sapi/fpm/Makefile.frag  2015-05-23 11:01:51.383332821 +0300
-@@ -11,9 +11,9 @@
-       @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
- 
-       @echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
--      $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || :
--      @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
--      @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || :
-+      $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
-+      @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
-+      @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
- 
+--- php-7.1.3/sapi/fpm/Makefile.frag~  2017-03-14 15:17:50.000000000 +0200
++++ php-7.1.3/sapi/fpm/Makefile.frag   2017-03-28 09:44:28.799989897 +0300
+@@ -14,9 +14,9 @@
+               echo "Installing PHP FPM defconfig:     skipping"; \
+       else \
+               echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
+-              $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+-              $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+-              $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++              $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \
++              $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++              $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \
+       fi
+       
        @echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
-       @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8

diff --git a/php-libtool.patch b/php-libtool.patch
index f9713d808e36cefd94bf442e9e1ebef78278d5e5..f3146711257d1883c2c712605a835d9072af57d7 100644 (file)
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -1,5 +1,5 @@
---- php-5.4.6/scripts/phpize.in~       2012-08-23 03:02:42.000000000 +0300
-+++ php-5.4.6/scripts/phpize.in        2012-08-23 10:16:37.011306948 +0300
+--- php-7.1.3/scripts/phpize.in~       2017-03-27 23:35:05.000000000 +0300
++++ php-7.1.3/scripts/phpize.in        2017-03-27 23:37:32.336520891 +0300
 @@ -6,10 +6,16 @@
  exec_prefix="`eval echo @exec_prefix@`"
  phpdir="`eval echo @libdir@`/php/build"
@@ -8,15 +8,15 @@
  builddir="`pwd`"
  SED="@SED@"
  
--FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
-+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool ax_check_compile_flag.m4"
 +if [ -f "$aclocaldir/ltsugar.m4" ]; then
 +    LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
 +else
 +    LIBTOOL_FILES="libtool.m4"
 +fi
  FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
- CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
+ CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
        mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
 @@ -145,8 +151,9 @@ phpize_copy_files()
    test -d build || mkdir build

diff --git a/php.spec b/php.spec
index a7b9bbbc4cd5e0bc7a2919f929f2719c586ff067..f207ee303f7b2bbb03978aae42c4ebf85ed06213 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -151,7 +151,7 @@ Summary(ru.UTF-8):  PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
 Version:       7.0.17
-Release:       1
+Release:       2
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend