Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2017-03-20 17:13:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Mon Mar 20 17:13:24 2017 rev:17 rq:481244 version:7.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2017-02-20 13:16:06.011978587 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2017-03-20 17:13:31.448309862 +0100 @@ -1,0 +2,11 @@ +Fri Mar 17 19:20:14 UTC 2017 - 13i...@gmail.com + +- Updated to 7.1.3: Several bugs have been fixed. + * ChangeLog: https://secure.php.net/ChangeLog-7.php#7.1.3 + +------------------------------------------------------------------- +Fri Mar 17 16:52:25 UTC 2017 - ku...@suse.com + +- Don't install the init script if we use systemd + +------------------------------------------------------------------- Old: ---- php-7.1.2.tar.xz php-7.1.2.tar.xz.asc New: ---- php-7.1.3.tar.xz php-7.1.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.I8074M/_old 2017-03-20 17:13:33.016088492 +0100 +++ /var/tmp/diff_new_pack.I8074M/_new 2017-03-20 17:13:33.016088492 +0100 @@ -1,7 +1,7 @@ # # spec file for package php7 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,14 +46,14 @@ %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.2 +Version: 7.1.3 Release: 0 Summary: PHP7 Core Files License: PHP-3.01 Group: Development/Languages/Other -Url: http://www.php.net -Source0: http://us2.php.net/distributions/php-%{version}.tar.xz +Url: https://secure.php.net +Source0: https://secure.php.net/distributions/php-%{version}.tar.xz Source1: php-suse-addons.tar.bz2 Source2: https://download.suhosin.org/suhosin-%{suhosin_version}.tar.gz Source3: https://pear.php.net/install-pear-nozlib.phar @@ -61,7 +61,7 @@ Source5: README.macros Source6: macros.php Source7: php-fpm.init -Source8: http://us3.php.net/distributions/php-%{version}.tar.xz.asc +Source8: https://secure.php.net/distributions/php-%{version}.tar.xz.asc Source9: php7.keyring Source10: README.default_socket_timeout Source100: build-test.sh @@ -220,8 +220,8 @@ %package devel Summary: Include files of PHP7 -# this is required by the installed development headers Group: Development/Languages/C and C++ +# this is required by the installed development headers Requires: %{name} = %{version} Requires: glibc-devel Requires: libxml2-devel @@ -256,7 +256,7 @@ similar to TeX's CTAN and Perl's CPAN. This package provides an access to the repository. -See http://pear.php.net/manual/ for more details. +See https://pear.php.net/manual/ for more details. %package pear-Archive_Tar @@ -341,7 +341,6 @@ Summary: FastCGI Process Manager PHP7 Module Group: Development/Libraries/PHP Requires: %{name} = %{version} -PreReq: %insserv_prereq Provides: php-date = %{version} Provides: php-filter = %{version} Provides: php-fpm = %{version} @@ -355,6 +354,8 @@ %if %{with systemd} %{systemd_requires} BuildRequires: pkgconfig(libsystemd) +%else +Requires(pre): %insserv_prereq %endif Obsoletes: php5-fpm @@ -839,7 +840,7 @@ %description sqlite This is an extension for the SQLite Embeddable SQL Database Engine. -http://www.sqlite.org/ +https://www.sqlite.org SQLite is a C library that implements an embeddable SQL database engine. Programs that link with the SQLite library can have SQL @@ -911,7 +912,7 @@ Obsoletes: php5-tidy %description tidy -Tidy is an extension based on Libtidy (http://tidy.sf.net/) and allows +Tidy is an extension based on Libtidy (http://tidy.sourceforge.net) and allows a PHP developer to clean, repair, and traverse HTML, XHTML, and XML documents -- including ones with embedded scripting languages such as PHP or ASP within them using OO constructs. @@ -1374,7 +1375,7 @@ echo "; comment out next line to disable $ext extension in php" > %{buildroot}/%{php_sysconf}/conf.d/$ext.ini zend_='' if [ $ext == "opcache" ]; then - # http://php.net/manual/en/opcache.installation.php + # https://secure.php.net/manual/en/opcache.installation.php zend_='zend_' fi echo "${zend_}extension=$ext.so" >> %{buildroot}/%{php_sysconf}/conf.d/$ext.ini @@ -1430,8 +1431,6 @@ $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php #install fpm init script. -install -d %{buildroot}%{_sysconfdir}/init.d -install -m 755 -c %{S:7} %{buildroot}%{_sysconfdir}/init.d/php-fpm %if %{with systemd} install -D -m 0644 ./build-fpm/sapi/fpm/php-fpm.service %{buildroot}%{_unitdir}/php-fpm.service %if 0%{suse_version} > 1220 @@ -1440,6 +1439,8 @@ 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 # pear installer installs .depdb{,lock} files into %{buildroot}%{peardir} @@ -1473,16 +1474,12 @@ %postun fpm %service_del_postun php-fpm.service -%restart_on_update php-fpm -%insserv_cleanup %preun fpm %service_del_preun php-fpm.service -%stop_on_removal php-fpm %post fpm %service_add_post php-fpm.service -%{fillup_and_insserv -f php-fpm} %else %postun fpm %restart_on_update php-fpm @@ -1562,12 +1559,13 @@ %dir %{php_sysconf}/fpm/php-fpm.d %config %{php_sysconf}/fpm/php-fpm.d/www.conf.default %{_mandir}/man8/php-fpm.8.gz -%config /etc/init.d/php-fpm %{_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 ++++++ php-7.1.2.tar.xz -> php-7.1.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/php7/php-7.1.2.tar.xz /work/SRC/openSUSE:Factory/.php7.new/php-7.1.3.tar.xz differ: char 26, line 1
