Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2017-09-07 22:11:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Thu Sep 7 22:11:29 2017 rev:22 rq:520867 version:7.1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2017-08-12 20:27:03.681215324 +0200 +++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2017-09-07 22:11:38.704244045 +0200 @@ -1,0 +2,28 @@ +Mon Sep 4 17:22:08 UTC 2017 - pgaj...@suse.com + +- php7-devel requires php7-pear [bsc#1057104] + +------------------------------------------------------------------- +Fri Sep 1 11:20:58 UTC 2017 - jweberho...@weberhofer.at + +- Changes related to boo#1056822 + +- New packaging macros in macros.php: %php_pearxmldir, + %pear_phpdir, %pear_phpdir, %pear_testdir, %pear_datadir, + %pear_cfgdir, %pear_wwwdir, %pear_metadir, %pecl_phpdir, + %pecl_docdir, %pecl_testdir, %pecl_datadir + +- Updated packaging documentation in README.macros + +------------------------------------------------------------------- +Thu Aug 31 16:57:08 UTC 2017 - i...@ilya.pp.ua + +- Updated to 7.1.9: Several bugs have been fixed. + * ChangeLog https://secure.php.net/ChangeLog-7.php#7.1.9 + +------------------------------------------------------------------- +Mon Aug 14 08:47:33 UTC 2017 - pgaj...@suse.com + +- added /usr/bin/php7 [bsc#734176] + +------------------------------------------------------------------- Old: ---- php-7.1.8.tar.xz php-7.1.8.tar.xz.asc New: ---- php-7.1.9.tar.xz php-7.1.9.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ ++++ 813 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/php7/php7.spec ++++ and /work/SRC/openSUSE:Factory/.php7.new/php7.spec ++++++ README.macros ++++++ --- /var/tmp/diff_new_pack.yVhuyF/_old 2017-09-07 22:11:40.983922749 +0200 +++ /var/tmp/diff_new_pack.yVhuyF/_new 2017-09-07 22:11:40.983922749 +0200 @@ -1,77 +1,106 @@ README for php-macros Author: Christian Wittmer <ch...@computersalat.de> +Author: Johannes Weberhofer <jweberho...@weberhofer.at> -%php_gen_filelist generates an rpmlint happy filelist of your installed files +%php_pear_gen_filelist generates an rpmlint happy filelist of your installed files In most cases you only need to check the %doc part sometimes there is a "Changes" or "ChangeLog",.... -Requirements for %php_gen_filelist +Requirements for %php_pear_gen_filelist You have to define following parts inside your spec file Example: -Name: php5-pear-Date -%define pear_name Date -%define pear_sname date - -BuildRequires: php-macros -Provides: php-pear-%{pear_name} pear-%{pear_name} -# Fix for renaming (package convention) -Provides: php5-pear-%{pear_sname} = %{version} -Provides: php-pear-%{pear_sname} = %{version} -Provides: pear-%{pear_sname} = %{version} -Obsoletes: php5-pear-%{pear_sname} < %{version} -Obsoletes: php-pear-%{pear_sname} < %{version} -Obsoletes: pear-%{pear_sname} < %{version} +# +# spec file for package php7-pear-Auth_SASL +# +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define php_name php7 +%define pear_name Auth_SASL +Name: php7-pear-Auth_SASL +Version: 1.1.0 +Release: 0 +Summary: Abstraction of various SASL mechanism responses +License: BSD-3-Clause +Group: Productivity/Networking/Web/Servers +Url: http://pear.php.net/package/%{pear_name} +Source: http://pear.php.net/get/%{pear_name}-%{version}.tgz +BuildRequires: %{php_name}-devel +BuildRequires: %{php_name}-pear >= 1.10.1 +Requires: %{php_name}-pear >= 1.10.1 +Provides: php-pear-%{pear_name} = %{version} +Provides: php-pear(%{pear_name}) = %{version} +Obsoletes: php5-pear-Auth_SASL +BuildArch: noarch +%if 0%{?suse_version} < 1330 +BuildRequires: %{php_name}-macros +BuildRequires: %{php_name}-pear-Archive_Tar +Requires: %{php_name}-pear-Archive_Tar +%endif + +%description +Provides code to generate responses to common SASL mechanisms, including: + - Digest-MD5 + - CramMD5 + - Plain + - Anonymous + - Login (Pseudo mechanism) + +%prep +%setup -q %setup -q -n %{pear_name}-%{version} +mv ../package.xml . -%install -%{__mv} package*.xml %{pear_name}-%{version} -cd %{pear_name}-%{version} -PHP_PEAR_PHP_BIN="$(which php) -d memory_limit=50m" -%{__pear} -v \ - -d doc_dir=/doc \ - -d bin_dir=%{_bindir} \ - -d data_dir=%{peardir}/data \ - install --offline --nodeps -R "$RPM_BUILD_ROOT" package.xml +%build -%{__install} -D -m 0644 package.xml $RPM_BUILD_ROOT%{php_pearxmldir}/%{pear_name}.xml +%install +%{__pear} install --nodeps --offline --packagingroot %{buildroot} package.xml +install -D -m 0644 package.xml %{buildroot}%{pear_xmldir}/%{pear_name}.xml -%{__rm} -rf $RPM_BUILD_ROOT/{doc,tmp} -%{__rm} -rf "$RPM_BUILD_ROOT"/%{peardir}/.{filemap,lock,registry,channels,depdb,depdblock} +rm -rf %{buildroot}/{doc,tmp} +rm -rf %{buildroot}/%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock} -%php_gen_filelist +%php_pear_gen_filelist %post -# on `rpm -ivh` PARAM is 1 -# on `rpm -Uvh` PARAM is 2 if [ "$1" = "1" ]; then - %{__pear} install --nodeps --soft --force --register-only %{php_pearxmldir}/%{pear_name}.xml + # on "rpm -ivh" + %{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml fi if [ "$1" = "2" ]; then - %{__pear} upgrade --offline --register-only %{php_pearxmldir}/%{pear_name}.xml + # on "rpm -Uvh" + %{__pear} upgrade --offline --register-only %{pear_xmldir}/%{pear_name}.xml fi %postun -# on `rpm -e` PARAM is 0 if [ "$1" = "0" ]; then + # on "rpm -e" %{__pear} uninstall --nodeps --ignore-errors --register-only pear.php.net/%{pear_name} fi -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(-,root,root) -%doc Changes README %changelog ############################################################################# -And here an Example of the generated filelist: +And here an Example of the generated filelist (does not match above package): /usr/share/php5/PEAR/Date.php %dir /usr/share/php5/PEAR/Date @@ -99,3 +128,4 @@ /usr/share/php5/PEAR/test/Date/tests/bugs/bug-8912.phpt /usr/share/php5/PEAR/test/Date/tests/bugs/bug-967.phpt /var/lib/pear/Date.xml + ++++++ macros.php ++++++ --- /var/tmp/diff_new_pack.yVhuyF/_old 2017-09-07 22:11:41.047913731 +0200 +++ /var/tmp/diff_new_pack.yVhuyF/_new 2017-09-07 22:11:41.051913167 +0200 @@ -13,10 +13,29 @@ %__phpize /usr/bin/phpize %__php_config /usr/bin/php-config %php_version %(%{__php_config} --version) -# + +# pear related macros %__pear /usr/bin/pear %php_peardir %(%{__pear} config-get php_dir) + +# %pear_xmldir should be replaced by %php_pearxmldir +%pear_xmldir /var/lib/pear + %php_pearxmldir /var/lib/pear +%pear_phpdir %(%{__pear} config-get php_dir 2> /dev/null || echo undefined) +%pear_docdir %(%{__pear} config-get doc_dir 2> /dev/null || echo undefined) +%pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined) +%pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined) +%pear_cfgdir %(%{__pear} config-get cfg_dir 2> /dev/null || echo undefined) +%pear_wwwdir %(%{__pear} config-get www_dir 2> /dev/null || echo undefined) +%pear_metadir %(%{__pear} config-get metadata_dir 2> /dev/null || echo undefined) + +# pecl related macros +%__pecl /usr/bin/pecl +%pecl_phpdir %(%{__pecl} config-get php_dir 2> /dev/null || echo undefined) +%pecl_docdir %(%{__pecl} config-get doc_dir 2> /dev/null || echo undefined) +%pecl_testdir %(%{__pecl} config-get test_dir 2> /dev/null || echo undefined) +%pecl_datadir %(%{__pecl} config-get data_dir 2> /dev/null || echo undefined) # macro: php_pear_gen_filelist # do the rpmlint happy filelist generation ++++++ php-7.1.8.tar.xz -> php-7.1.9.tar.xz ++++++ /work/SRC/openSUSE:Factory/php7/php-7.1.8.tar.xz /work/SRC/openSUSE:Factory/.php7.new/php-7.1.9.tar.xz differ: char 27, line 1
