Hello community,
here is the log from the commit of package php7-pear for openSUSE:Factory
checked in at 2020-04-14 15:09:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7-pear (Old)
and /work/SRC/openSUSE:Factory/.php7-pear.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7-pear"
Tue Apr 14 15:09:00 2020 rev:4 rq:792986 version:1.10.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/php7-pear/php7-pear.changes 2020-03-03
10:14:18.154409812 +0100
+++ /work/SRC/openSUSE:Factory/.php7-pear.new.2738/php7-pear.changes
2020-04-14 16:28:09.199952902 +0200
@@ -1,0 +2,7 @@
+Fri Apr 10 20:17:07 UTC 2020 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- Update to version 1.10.18
+- Remove pear-cacheid-array-check.patch (upstreamed)
+- Contents of .filemap are now sorted internally
+
+-------------------------------------------------------------------
Old:
----
pear-cacheid-array-check.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php7-pear.spec ++++++
--- /var/tmp/diff_new_pack.H2Tq01/_old 2020-04-14 16:28:09.659953316 +0200
+++ /var/tmp/diff_new_pack.H2Tq01/_new 2020-04-14 16:28:09.659953316 +0200
@@ -22,7 +22,7 @@
%define pear_module_version(m) %(sed -n 's/.*=>.*%{1}-\\(.*\\)\\.tar.*/\\1/p'
%{SOURCE0})
Name: php7-pear
-Version: 1.10.17
+Version: 1.10.18
Release: 0
Summary: PHP Extension and Application Repository
License: BSD-2-Clause
@@ -32,8 +32,6 @@
Source1:
https://github.com/pear/pearweb_phars/raw/v%{version}/install-pear-nozlib.sig#/install-pear-nozlib.phar.sig
Source2: %{name}.keyring
Source3: %{name}.rpmlintrc
-# PATCH-FIX-UPSTREAM https://bugs.php.net/78890
-Patch0: pear-cacheid-array-check.patch
BuildRequires: php7
Requires: php7
Recommends: php7-openssl
@@ -98,17 +96,6 @@
--metadata %{metadir} \
--www %{peardir}/htdocs
-php -r '$filemap =
unserialize(file_get_contents("%{buildroot}%{metadir}/.filemap"));
- ksort($filemap);
- foreach($filemap as &$value) {
- ksort($value);
- }
- file_put_contents("%{buildroot}%{metadir}/.filemap",
serialize($filemap));'
-
-pushd %{buildroot}%{peardir}
-patch -p1 < %{PATCH0}
-popd
-
%pre
if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then
mkdir -p %{metadir}
++++++ install-pear-nozlib.phar ++++++
++++ 3207 lines (skipped)
++++ between install-pear-nozlib.phar
++++ and /work/SRC/openSUSE:Factory/.php7-pear.new.2738/install-pear-nozlib.phar
++++++ install-pear-nozlib.phar.sig ++++++
Binary files /var/tmp/diff_new_pack.H2Tq01/_old and
/var/tmp/diff_new_pack.H2Tq01/_new differ
