Hello community,

here is the log from the commit of package php7 for openSUSE:Factory checked in 
at 2017-08-12 20:27:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
 and      /work/SRC/openSUSE:Factory/.php7.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "php7"

Sat Aug 12 20:27:00 2017 rev:21 rq:514860 version:7.1.8

Changes:
--------
--- /work/SRC/openSUSE:Factory/php7/php7.changes        2017-06-10 
17:51:42.001905174 +0200
+++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes   2017-08-12 
20:27:03.681215324 +0200
@@ -1,0 +2,47 @@
+Mon Aug  7 08:03:06 UTC 2017 - jweberho...@weberhofer.at
+
+- php7-pear should explicitly require php7-pear-Archive_Tar
+  otherwise this dependency must be declared in every
+  php7-pear-* package explicitly. [bnc#1052389]
+
+-------------------------------------------------------------------
+Wed Aug  2 20:18:24 UTC 2017 - i...@ilya.pp.ua
+
+- Updated to 7.1.8: Several bugs have been fixed.
+  * ChangeLog https://secure.php.net/ChangeLog-7.php#7.1.8
+
+-------------------------------------------------------------------
+Wed Jul 26 23:41:38 UTC 2017 - i...@ilya.pp.ua
+
+- Replace %__-type macro indirections.
+
+-------------------------------------------------------------------
+Fri Jul 21 12:18:43 UTC 2017 - pgaj...@suse.com
+
+- date extension: regenerate lexers when needed
+  + php7-date-regenerate-lexers.patch
+
+-------------------------------------------------------------------
+Mon Jul 17 08:23:55 UTC 2017 - pgaj...@suse.com
+
+- dropped mcrypt extension [fate#323673]
+
+-------------------------------------------------------------------
+Mon Jul 17 08:14:37 UTC 2017 - pgaj...@suse.com
+
+- updated to 7.1.7: This is a security release with several bug 
+  fixes included.
+
+-------------------------------------------------------------------
+Mon Jul  3 18:47:39 UTC 2017 - tchva...@suse.com
+
+- Drop sle11 support as we are not building against it anymore
+- Remove php7-BNC-457056.patch that was applied on sle11 only
+- Remove dependency on imap-devel, it is not used
+- Switch spell from aspell to enchant, dropping pspell subpackage
+- Remove unknown switch options from php cli build
+- Drop support for berkleydb format, by default there are more
+  supported solutions built in php
+- Use %configure macro in the build phases
+
+-------------------------------------------------------------------

Old:
----
  php-7.1.6.tar.xz
  php-7.1.6.tar.xz.asc
  php-fpm.init
  php7-BNC-457056.patch

New:
----
  php-7.1.8.tar.xz
  php-7.1.8.tar.xz.asc
  php7-date-regenerate-lexers.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ php7.spec ++++++
--- /var/tmp/diff_new_pack.PMfLaA/_old  2017-08-12 20:27:05.384976561 +0200
+++ /var/tmp/diff_new_pack.PMfLaA/_new  2017-08-12 20:27:05.392975440 +0200
@@ -24,15 +24,8 @@
 # related conditions can be removed entirely
 %bcond_with suhosin
 
-# systemd first added in 12.1
-%if 0%{suse_version} < 1210
-%define _without_systemd 1
-%endif
-
 # firebird disabled due to build errors: https://bugs.php.net/bug.php?id=70071
 %bcond_without  firebird
-%bcond_without  spell
-%bcond_without  systemd
 
 %global apiver            20160303
 %global zendver           20160303
@@ -42,11 +35,8 @@
 %define extension_dir     %{_libdir}/%{pkg_name}/extensions
 %define peardir           %{_datadir}/%{pkg_name}/PEAR
 %define php_sysconf       %{_sysconfdir}/%{pkg_name}
-%define _x11prefix        %(pkg-config --variable=prefix xft)
-%define need_libxml2_hack %(if [ -e %{_includedir}/libxml/parser.h ]; then if 
grep -q XML_PARSE_OLDSAX %{_includedir}/libxml/parser.h; then echo 1; else echo 
0; fi; else echo 0; fi)
-
 Name:           php7
-Version:        7.1.6
+Version:        7.1.8
 Release:        0
 Summary:        PHP7 Core Files
 License:        PHP-3.01
@@ -60,7 +50,6 @@
 Source4:        README.SUSE-pear
 Source5:        README.macros
 Source6:        macros.php
-Source7:        php-fpm.init
 Source8:        https://secure.php.net/distributions/php-%{version}.tar.xz.asc
 Source9:        php7.keyring
 Source10:       README.default_socket_timeout
@@ -78,7 +67,6 @@
 Patch9:         php7-depdb-path.patch
 
 ## Bugfix patches
-Patch11:        php7-BNC-457056.patch
 # following patch is to fix configure tests for crypt; the aim is to have php
 # built against glibc's crypt; problem is, that our glibc doesn't support 
extended
 # DES, so as soon as upstream fixes this, don't forgot to remove extended DES
@@ -91,7 +79,8 @@
 Patch15:        php7-fix_net-snmp_disable_MD5.patch
 # https://bugs.php.net/bug.php?id=70015
 Patch16:        aarch64-mult.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# should be upstreamed, will do later
+Patch17:        php7-date-regenerate-lexers.patch
 BuildRequires:  apache-rpm-macros
 BuildRequires:  apache2-devel
 BuildRequires:  autoconf
@@ -99,7 +88,6 @@
 BuildRequires:  curl
 BuildRequires:  curl-devel
 BuildRequires:  cyrus-sasl-devel
-BuildRequires:  db-devel
 BuildRequires:  enchant-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
@@ -113,7 +101,6 @@
 BuildRequires:  libevent-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libmcrypt-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtidy-devel
@@ -135,26 +122,16 @@
 BuildRequires:  update-alternatives
 BuildRequires:  xz
 
-%if 0%{suse_version} > 1110
 BuildRequires:  pkgconfig(vpx)
 BuildRequires:  pkgconfig(xft)
 BuildRequires:  pkgconfig(xpm)
-%else
-BuildRequires:  xorg-x11-devel
-%endif
 
-%if 0%{suse_version} > 1110
 BuildRequires:  freetds-devel
-%endif
 
 %if 0%{suse_version} >= 1320
 BuildRequires:  libzip-devel
 %endif
 
-%if %{with spell}
-BuildRequires:  aspell-devel
-%endif
-
 %define build_firebird 0
 %if %{with firebird}
 %if 0%{?suse_version} > 1210
@@ -208,6 +185,7 @@
 # conflicts with php5 and should replace it
 Obsoletes:      php < %{version}
 Obsoletes:      php5
+Obsoletes:      php7-mcrypt
 
 %description
 This package contains the PHP 7 core files, including PHP binary (CLI)
@@ -247,7 +225,7 @@
 Group:          Development/Libraries/PHP
 BuildArch:      noarch
 Requires:       %{name}-zlib = %{version}
-Requires:       php-pear-Archive_Tar
+Requires:       php7-pear-Archive_Tar
 Provides:       php-pear = %{version}
 Obsoletes:      php5-pear
 
@@ -256,7 +234,7 @@
 similar to TeX's CTAN and Perl's CPAN. This package provides an access
 to the repository.
 
-See https://pear.php.net/manual/ for more details.
+See https://pear.php.net/manual for more details.
 
 
 %package pear-Archive_Tar
@@ -350,13 +328,8 @@
 Provides:       php-simplexml = %{version}
 Provides:       php-spl = %{version}
 Provides:       php-xml = %{version}
-
-%if %{with systemd}
 %{systemd_requires}
 BuildRequires:  pkgconfig(libsystemd)
-%else
-Requires(pre):  %insserv_prereq
-%endif
 Obsoletes:      php5-fpm
 
 %description fpm
@@ -461,6 +434,9 @@
 Requires:       %{name} = %{version}
 Provides:       php-enchant = %{version}
 Obsoletes:      php5-enchant
+# Obsolete pspell plugin as enchant is favored solution (goodbye aspell)
+Obsoletes:      php5-pspell
+Obsoletes:      php7-pspell
 
 %description enchant
 Enchant is the PHP binding for the Enchant library. Enchant steps in to 
provide uniformity and conformity on top of all spelling libraries, and 
implements certain features that may be lacking in any individual provider 
library. Everything should "just work" for any and every definition of "just 
working."
@@ -610,18 +586,6 @@
 other utility functions such as conversion functions.
 
 
-%package mcrypt
-Summary:        PHP7 Extension Module
-Group:          Development/Libraries/PHP
-Requires:       %{name} = %{version}
-Provides:       php-mcrypt = %{version}
-Obsoletes:      php5-mcrypt
-
-%description mcrypt
-PHP interface to the mcrypt library, which supports a wide variety of
-block algorithms.
-
-
 %package mysql
 Summary:        PHP7 Extension Module
 Group:          Development/Libraries/PHP
@@ -754,20 +718,6 @@
 This module allows to use POSIX-like functions in PHP.
 
 
-%if %{with spell}
-%package pspell
-Summary:        PHP7 pspell extension
-Group:          Development/Libraries/PHP
-Requires:       %{name} = %{version}
-Requires:       aspell-en
-Provides:       php-pspell = %{version}
-Obsoletes:      php5-pspell
-
-%description pspell
-PHP interface to the aspell, which provides spell checking
-functionality.
-%endif
-
 %package readline
 Summary:        PHP7 readline extension
 Group:          Development/Libraries/PHP
@@ -1017,14 +967,14 @@
 %prep
 echo %{apache_mmn}
 %setup -q -n php-%{version} -a 1
-%{__tar} xf %{S:2} -C ext
+tar xf %{S:2} -C ext
 %if %{with suhosin}
-%{__mv} ext/suhosin-%{suhosin_version} ext/suhosin
+mv ext/suhosin-%{suhosin_version} ext/suhosin
 %endif
-%{__cp} %{S:3} pear
-%{__cp} %{S:4} pear/README.SUSE
-%{__cp} %{S:5} .
-%{__cp} %{S:10} .
+cp %{S:3} pear
+cp %{S:4} pear/README.SUSE
+cp %{S:5} .
+cp %{S:10} .
 
 %patch0
 %patch2
@@ -1034,16 +984,11 @@
 %patch6
 %patch7 -p1
 %patch8 -p1
-%if %{need_libxml2_hack}
-echo "*** APPLY LIBXML2.7 FIX ***"
-%patch11
-%else
-echo "*** SKIPPING LIBMXL2.7 FIX ***"
-%endif
 %patch12 -p1
 %patch14
 %patch15
 %patch16 -p1
+%patch17 -p1
 
 # Safety check for API version change.
 vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
@@ -1071,19 +1016,19 @@
 # Regenerate configure scripts (patches change config.m4's)
 touch configure.in
 # we build three SAPI
-%{__mkdir_p} build-apache2
-%{__mkdir_p} build-fpm
-%{__mkdir_p} build-fastcgi
-%{__mkdir_p} build-cli
+mkdir -p build-apache2
+mkdir -p build-fpm
+mkdir -p build-fastcgi
+mkdir -p build-cli
 
 #for parser in `find -name "*.re"`;do
 #    re2c -c --no-generation-date -gi "$parser" > ${parser%.*}.c
 #done
 
-%{__rm} -r ext/pcre/pcrelib
+rm -r ext/pcre/pcrelib
 
 # regenerate configure etc.
-%{__rm} configure
+rm configure
 ./buildconf --force
 
 # export flags
@@ -1111,11 +1056,9 @@
     sapi=$1
     pushd build-$1
     shift
-    ../configure \
-        --prefix=%{_prefix} \
+    ln -sf ../configure
+    %configure \
         --datadir=%{_datadir}/%{pkg_name} \
-        --mandir=%{_mandir} \
-        --bindir=%{_bindir} \
         --with-libdir=%{_lib} \
         --includedir=%{_includedir} \
         --sysconfdir=%{php_sysconf}/$sapi \
@@ -1123,11 +1066,7 @@
         --with-config-file-scan-dir=%{php_sysconf}/conf.d \
         --enable-libxml \
         --enable-session \
-%if 0%{?suse_version} > 1010
         --with-pcre-regex=%{_usr} \
-%else
-        --with-pcre-regex \
-%endif
         --enable-xml \
         --enable-simplexml \
         --enable-filter \
@@ -1155,9 +1094,9 @@
     #  - pcre is needed for PEAR
     #  - filter is builtin due security reasons
     # We have still have harcoded RPATH in some modules
-    %{__sed} -i 
's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-    %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' 
libtool
-    %{__make} %{?jobs:-j%jobs PHP_PEAR_PHP_BIN=%{_bindir}/php}
+    sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' 
libtool
+    sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=LIBTOOL_IS_BROKED|g' libtool
+    make %{?_smp_mflags} PHP_PEAR_PHP_BIN=%{_bindir}/php}
     popd
 }
 
@@ -1178,9 +1117,7 @@
     --disable-all
 
 Build fpm \
-%if %{with systemd}
     --with-fpm-systemd \
-%endif
     --enable-fpm \
     --bindir=%{_bindir} \
     --disable-cli \
@@ -1218,14 +1155,11 @@
     --with-gd=shared \
 %endif
     --enable-gd-native-ttf \
-    --with-xpm-dir=%{_x11prefix} \
+    --with-xpm-dir=%{_usr} \
     --with-freetype-dir=%{_usr} \
     --with-png-dir=%{_usr} \
     --with-jpeg-dir=%{_usr} \
     --with-zlib-dir=%{_usr} \
-%if 0%{suse_version} > 1110
-    --with-vpx-dir=%{_usr} \
-%endif
     --with-gettext=shared \
     --with-gmp=shared \
     --with-iconv=shared \
@@ -1236,25 +1170,16 @@
     --with-ldap=shared \
     --with-ldap-sasl=%{_usr} \
     --with-libedit=shared,%{_usr} \
-    --with-mcrypt=shared \
-    --with-mysql=shared,mysqlnd \
 %if %{build_firebird}
     --with-interbase=shared \
 %endif
-%if 0%{?suse_version} > 1110
     --with-mysql-sock=/var/run/mysql/mysql.sock \
-%else
-    --with-mysql-sock=/var/lib/mysql/mysql.sock \
-%endif
     --with-mysqli=shared,mysqlnd \
     --with-unixODBC=shared,%{_usr} \
     --with-openssl=shared \
     --with-pgsql=shared,%{_usr} \
     --enable-phar=shared \
-%if %{with spell}
-    --with-pspell=shared \
     --with-enchant=shared,%{_usr} \
-%endif
     --with-snmp=shared \
     --with-xmlrpc=shared \
     --enable-xmlreader=shared \
@@ -1262,15 +1187,11 @@
     --with-xsl=shared \
     --with-tidy=shared,%{_usr} \
     --enable-dba=shared \
-    --with-db4=%{_usr} \
     --without-gdbm \
     --with-cdb \
-    --with-inifile \
-    --with-flatfile \
     --enable-pdo=shared \
     --with-pdo_sqlite=shared,%{_usr} \
     --with-sqlite3=shared,%{_usr} \
-    --enable-sqlite-utf8 \
     --with-pdo-mysql=shared,mysqlnd \
 %if %{build_firebird}
     --with-pdo-firebird=shared \
@@ -1282,9 +1203,6 @@
     --enable-suhosin=shared \
 %endif
     --enable-intl=shared,%{_usr} \
-%if 0%{suse_version} > 1110
-    --with-mssql=shared,%{_usr} \
-%endif
     --disable-cgi
 
 %check
@@ -1299,7 +1217,7 @@
 %if %{with make_test}
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 LANG=POSIX LC_ALL=POSIX
 unset TZ
-%{__make} test || true
+make test || true
 set +x
 for f in `find .. -name "*.diff" -type f -print`; do
     echo "TEST FAILURE: $f --"
@@ -1333,7 +1251,7 @@
 Install()
 {
     pushd build-$1
-    %{__make} install INSTALL_ROOT=%{buildroot} PHP_PEAR_PHP_BIN=%{_bindir}/php
+    make install INSTALL_ROOT=%{buildroot} PHP_PEAR_PHP_BIN=%{_bindir}/php
     popd
 }
 
@@ -1341,30 +1259,26 @@
 Install apache2
 
 #need it for yast module
-%{__mv} %{buildroot}%{apache_libexecdir}/libphp7.so 
%{buildroot}%{apache_libexecdir}/mod_php7.so
+mv %{buildroot}%{apache_libexecdir}/libphp7.so 
%{buildroot}%{apache_libexecdir}/mod_php7.so
 Install fastcgi
 Install cli
 Install fpm
 
 # generate php.ini from php.ini-production:
-%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/conf.d
-%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/apache2
-%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/cli
-%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/fastcgi
-%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/fpm
-%{__sed} "s=@extdir@=%{extension_dir}=" php.ini-production \
-    > %{buildroot}/%{php_sysconf}/apache2/php.ini
-%{__sed} "s=@extdir@=%{extension_dir}=" php.ini-production \
-    | %{__sed} -r 
's/^(html_errors|implicit_flush|max_execution_time|register_argc_argv)/;\1/' \
-    > %{buildroot}/%{php_sysconf}/cli/php.ini
-%{__sed} "s=@extdir@=%{extension_dir}=" php.ini-production \
-    > %{buildroot}/%{php_sysconf}/fastcgi/php.ini
+install -dm 755 %{buildroot}/%{php_sysconf}/conf.d
+install -dm 755 %{buildroot}/%{php_sysconf}/apache2
+install -dm 755 %{buildroot}/%{php_sysconf}/cli
+install -dm 755 %{buildroot}/%{php_sysconf}/fastcgi
+install -dm 755 %{buildroot}/%{php_sysconf}/fpm
+sed "s=@extdir@=%{extension_dir}=" php.ini-production > 
%{buildroot}/%{php_sysconf}/apache2/php.ini
+sed "s=@extdir@=%{extension_dir}=" php.ini-production | sed -r 
's/^(html_errors|implicit_flush|max_execution_time|register_argc_argv)/;\1/' > 
%{buildroot}/%{php_sysconf}/cli/php.ini
+sed "s=@extdir@=%{extension_dir}=" php.ini-production > 
%{buildroot}/%{php_sysconf}/fastcgi/php.ini
 
 # prepare configuration files for each extension
 extern_modules=""
 for f in %{buildroot}%{extension_dir}/*; do
     if test ${f##*.} = a; then
-        %{__rm} $f
+        rm $f
         continue
     fi
     if test ${f##*.} = so; then
@@ -1382,35 +1296,35 @@
 done
 #suhosin configuration
 %if %{with suhosin}
-%{__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
 %endif
 # list of builtin modules
 builtin_modules=`./build-cli/sapi/cli/php -m | grep -E -v '^(\[.*)?$' | sort | 
tr '\n' ' '`
 # update readme
-%{__sed} 
"s=@EXTERN_MODULES@=$extern_modules=;s=@BUILTIN_MODULES@=$builtin_modules=" 
php-suse-addons/README.SUSE > README.SUSE
+sed 
"s=@EXTERN_MODULES@=$extern_modules=;s=@BUILTIN_MODULES@=$builtin_modules=" 
php-suse-addons/README.SUSE > README.SUSE
 # apache configuration
-%{__mkdir_p} %{buildroot}%{apache_sysconfdir}/conf.d
-%{__install} -m 644 php-suse-addons/sysconfig.apache2 
%{buildroot}/%{apache_sysconfdir}/conf.d/%{pkg_name}.conf
+mkdir -p %{buildroot}%{apache_sysconfdir}/conf.d
+install -m 644 php-suse-addons/sysconfig.apache2 
%{buildroot}/%{apache_sysconfdir}/conf.d/%{pkg_name}.conf
 # directory for sessions
-%{__install} -d %{buildroot}/var/lib/%{pkg_name}
+install -d %{buildroot}/var/lib/%{pkg_name}
 # documentation
-%{__mv} sapi/cli/README README.CLI
-%{__mv} sapi/cgi/README.FastCGI README.FastCGI
-%{__rm} -rf %{buildroot}/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev}
-%{__install} -d -m 0755 %{buildroot}/%{peardir}/test
+mv sapi/cli/README README.CLI
+mv sapi/cgi/README.FastCGI README.FastCGI
+rm -rf %{buildroot}/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev}
+install -dm 0755 %{buildroot}/%{peardir}/test
 # for pear XML files
-%{__install} -d -m 0755 %{buildroot}/var/lib/pear
+install -dm 0755 %{buildroot}/var/lib/pear
 # provide compat symlink
-%{__mkdir_p} %{buildroot}/srv/www/cgi-bin
-%{__ln_s} /usr/bin/php-cgi %{buildroot}/srv/www/cgi-bin/php
+mkdir -p %{buildroot}/srv/www/cgi-bin
+ln -s /usr/bin/php-cgi %{buildroot}/srv/www/cgi-bin/php
 #fix symlink
-sed -i -e "s@$RPM_BUILD_DIR/php-%{rversion}/build-cli/sapi/cli/php@php@g" 
%{buildroot}%{_bindir}/phar.phar
+sed -i -e "s@%{_builddir}/php-%{rversion}/build-cli/sapi/cli/php@php@g" 
%{buildroot}%{_bindir}/phar.phar
 rm %{buildroot}%{_bindir}/phar
-%{__ln_s} -f %{_bindir}/phar.phar %{buildroot}%{_bindir}/phar
+ln -sf %{_bindir}/phar.phar %{buildroot}%{_bindir}/phar
 # CVE-2014-5459, bnc#893849; couldn't find a way to use PHP_PEAR_CACHE_DIR 
 # (install-pear is checking if the directory is writable by current user?;
 #  unfortunately ENOTIME to figure out)
-%{__sed} -i 's@15:"/tmp/pear/cache"@19:"/var/cache/php-pear"@' 
%{buildroot}%{php_sysconf}/cli/pear.conf
+sed -i 's@15:"/tmp/pear/cache"@19:"/var/cache/php-pear"@' 
%{buildroot}%{php_sysconf}/cli/pear.conf
 grep -c '/var/cache/php-pear' %{buildroot}%{php_sysconf}/cli/pear.conf || exit 
1
 # after the update for php 5.6.15 landed in Tumbleweed, almost all PEAR
 # packages building against broke. The metadata generated when building
@@ -1421,28 +1335,16 @@
 # This option is not set in the current php7 package, but maybe providing
 # a default value for this would resolve the issue for the +100 packages.
 pd=%{peardir}
-%{__sed} -i "s@\"metadata_dir\";s:0:\"\"@\"metadata_dir\";s:${#pd}:\"${pd}\"@" 
%{buildroot}%{php_sysconf}/cli/pear.conf
+sed -i "s@\"metadata_dir\";s:0:\"\"@\"metadata_dir\";s:${#pd}:\"${pd}\"@" 
%{buildroot}%{php_sysconf}/cli/pear.conf
 grep -c "\"metadata_dir\";s:${#pd}:\"${pd}\""  
%{buildroot}%{php_sysconf}/cli/pear.conf || exit 1
 # Install the macros file:
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-sed -e "s/@PHP_APIVER@/%{apiver}/;s/@PHP_ZENDVER@/%{zendver}/" \
-    < $RPM_SOURCE_DIR/macros.php > macros.php
-install -m 644 -c macros.php \
-           $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php
+install -d %{buildroot}%{_sysconfdir}/rpm
+sed -e "s/@PHP_APIVER@/%{apiver}/;s/@PHP_ZENDVER@/%{zendver}/" < 
$RPM_SOURCE_DIR/macros.php > macros.php
+install -m 644 -c macros.php %{buildroot}%{_sysconfdir}/rpm/macros.php
 
 #install fpm init script.
-%if %{with systemd}
 install -D -m 0644 ./build-fpm/sapi/fpm/php-fpm.service 
%{buildroot}%{_unitdir}/php-fpm.service
-%if 0%{suse_version} > 1220
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcphp-fpm
-%else
-ln -s /sbin/service %{buildroot}%{_sbindir}/rcphp-fpm
-%endif
-%else
-install -d %{buildroot}%{_sysconfdir}/init.d
-install -m 755 -c %{S:7} %{buildroot}%{_sysconfdir}/init.d/php-fpm
-ln -s %{_sysconfdir}/init.d/php-fpm %{buildroot}%{_sbindir}/rcphp-fpm
-%endif
+ln -s service %{buildroot}%{_sbindir}/rcphp-fpm
 # pear installer installs .depdb{,lock} files into %{buildroot}%{peardir}
 # along with .lock, .registry when metadata_dir is not set but does not 
 # install them if metadata_dir is set; our Horde packages expect them there 
@@ -1468,7 +1370,6 @@
     fi
 fi
 
-%if %{with systemd}
 %pre fpm
 %service_add_pre php-fpm.service
 
@@ -1480,17 +1381,6 @@
 
 %post fpm
 %service_add_post php-fpm.service
-%else
-%postun fpm
-%restart_on_update php-fpm
-%insserv_cleanup
-
-%preun fpm
-%stop_on_removal php-fpm
-
-%post fpm
-%{fillup_and_insserv -f php-fpm}
-%endif
 
 %postun -n apache2-mod_php7
 # request restart apache instanaces (which loaded php7) after apache2-mod_php7 
package update
@@ -1562,11 +1452,7 @@
 %{_sbindir}/rcphp-fpm
 %dir %{_datadir}/%{pkg_name}/fpm
 %{_datadir}/%{pkg_name}/fpm/status.html
-%if %{with systemd}
 %{_unitdir}/php-fpm.service
-%else
-%config /etc/init.d/php-fpm
-%endif
 
 %files -n apache2-mod_php7
 %defattr(-,root,root)
@@ -1675,11 +1561,6 @@
 %{extension_dir}/mbstring.so
 %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
-
 %files mysql
 %defattr(644,root,root,755)
 %{extension_dir}/mysqli.so
@@ -1742,13 +1623,6 @@
 %{extension_dir}/posix.so
 %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
-%endif
-
 %files readline
 %defattr(644,root,root,755)
 %{extension_dir}/readline.so


++++++ php-7.1.6.tar.xz -> php-7.1.8.tar.xz ++++++
/work/SRC/openSUSE:Factory/php7/php-7.1.6.tar.xz 
/work/SRC/openSUSE:Factory/.php7.new/php-7.1.8.tar.xz differ: char 27, line 1

++++++ php7-date-regenerate-lexers.patch ++++++
Index: php-7.1.7/ext/date/config0.m4
===================================================================
--- php-7.1.7.orig/ext/date/config0.m4  2017-07-06 11:30:06.000000000 +0200
+++ php-7.1.7/ext/date/config0.m4       2017-07-21 13:56:15.183675982 +0200
@@ -10,6 +10,8 @@ timelib_sources="lib/astro.c lib/dow.c l
 
 PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
 
+PHP_ADD_MAKEFILE_FRAGMENT()
+
 PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
 PHP_ADD_INCLUDE([$ext_builddir/lib])
 PHP_ADD_INCLUDE([$ext_srcdir/lib])
Index: php-7.1.7/ext/date/Makefile.frag
===================================================================
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
+++ php-7.1.7/ext/date/Makefile.frag    2017-07-21 13:58:51.986357906 +0200
@@ -0,0 +1,6 @@
+$(srcdir)/lib/parse_date.c: $(srcdir)/lib/parse_date.re
+       @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o 
ext/date/lib/parse_date.c ext/date/lib/parse_date.re)
+
+$(srcdir)/lib/parse_iso_intervals.c: $(srcdir)/lib/parse_iso_intervals.re
+       @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o 
ext/date/lib/parse_iso_intervals.c    ext/date/lib/parse_iso_intervals.re)
+


Reply via email to