From a4985fc101a469bc9971b1fd267d9cdebed263e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Feb 2019 09:39:11 +0100 Subject: update to 2.2.2 drop patch merged upstream use range dependencies --- php-horde-Horde-Compress-pr1.patch | 38 ----------------------------------- php-horde-Horde-Compress.spec | 41 +++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 50 deletions(-) delete mode 100644 php-horde-Horde-Compress-pr1.patch diff --git a/php-horde-Horde-Compress-pr1.patch b/php-horde-Horde-Compress-pr1.patch deleted file mode 100644 index 4fea729..0000000 --- a/php-horde-Horde-Compress-pr1.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 85336803f0d78ce9d5530617898e0809cddb3c50 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 14 Nov 2017 08:15:39 +0100 -Subject: [PATCH] don't rely on directory order - ---- - test/Horde/Compress/TarTest.php | 3 +++ - test/Horde/Compress/ZipTest.php | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/test/Horde/Compress/TarTest.php b/test/Horde/Compress/TarTest.php -index 1875f8b..af1a2ca 100644 ---- a/test/Horde/Compress/TarTest.php -+++ b/test/Horde/Compress/TarTest.php -@@ -111,6 +111,9 @@ public function testTarDirectory() - $this->assertNotEmpty($tar_data); - - $list = $compress->decompress($tar_data); -+ usort($list, function ($a, $b) { -+ return strcmp($a['name'], $b['name']); -+ }); - $this->assertCount(3, $list); - $this->assertEquals('one.txt', $list[0]['name']); - $this->assertEquals(4, $list[0]['size']); -diff --git a/test/Horde/Compress/ZipTest.php b/test/Horde/Compress/ZipTest.php -index 7e215b2..9a74b59 100644 ---- a/test/Horde/Compress/ZipTest.php -+++ b/test/Horde/Compress/ZipTest.php -@@ -142,6 +142,9 @@ public function testZipDirectory() - $list = $compress->decompress( - $zip_data, array('action' => Horde_Compress_Zip::ZIP_LIST) - ); -+ usort($list, function ($a, $b) { -+ return strcmp($a['name'], $b['name']); -+ }); - $this->assertCount(3, $list); - $this->assertEquals('one.txt', $list[0]['name']); - $this->assertEquals(4, $list[0]['size']); diff --git a/php-horde-Horde-Compress.spec b/php-horde-Horde-Compress.spec index 51cc790..57c2ee1 100644 --- a/php-horde-Horde-Compress.spec +++ b/php-horde-Horde-Compress.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-horde-Horde-Compress # -# Copyright (c) 2012-2017 Nick Bebout, Remi Collet +# Copyright (c) 2012-2019 Nick Bebout, Remi Collet # # License: MIT # https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense @@ -12,28 +12,32 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Compress -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: Horde Compression API -Group: Development/Libraries License: LGPLv2 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -# https://github.com/horde/Compress/pull/1 -Patch0: %{name}-pr1.patch - BuildArch: noarch BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) BuildRequires: gettext # To run unit tests +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 with php-pear(%{pear_channel}/Horde_Test) < 3) +BuildRequires: (php-pear(%{pear_channel}/Horde_Stream_Filter) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Stream_Filter) < 3) +BuildRequires: (php-pear(%{pear_channel}/Horde_Mime) >= 2.5.0 with php-pear(%{pear_channel}/Horde_Mime) < 3) +BuildRequires: (php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Icalendar) < 3) +BuildRequires: (php-pear(%{pear_channel}/Horde_Mapi) >= 1.0.0 with php-pear(%{pear_channel}/Horde_Mapi) < 2) +%else BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 BuildRequires: php-pear(%{pear_channel}/Horde_Stream_Filter) >= 2.0.0 BuildRequires: php-pear(%{pear_channel}/Horde_Mime) >= 2.5.0 BuildRequires: php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0 BuildRequires: php-pear(%{pear_channel}/Horde_Mapi) >= 1.0.0 +%endif # avoid Math_Biginteger native implementation BuildRequires: php-gmp @@ -43,6 +47,15 @@ Requires(postun): %{__pear} Requires: php(language) >= 5.3.0 Requires: php-pear(PEAR) >= 1.7.0 Requires: php-channel(%{pear_channel}) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3) +Requires: (php-pear(%{pear_channel}/Horde_Mime) >= 2.5.0 with php-pear(%{pear_channel}/Horde_Mime) < 3) +Requires: (php-pear(%{pear_channel}/Horde_Translation) >= 2.2.0 with php-pear(%{pear_channel}/Horde_Translation) < 3) +Requires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3) +# From package.xml, Optional +Recommends: (php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Icalendar) < 3) +Recommends: (php-pear(%{pear_channel}/Horde_Mapi) >= 1.0.0 with php-pear(%{pear_channel}/Horde_Mapi) < 2) +%else Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Mime) >= 2.5.0 @@ -52,11 +65,12 @@ Requires: php-pear(%{pear_channel}/Horde_Translation) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0 # From package.xml, Optional -Requires: php-zlib Requires: php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Icalendar) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Mapi) >= 1.0.0 Requires: php-pear(%{pear_channel}/Horde_Mapi) < 2.0.0 +%endif +Requires: php-zlib # From phpcompatinfo reporet form version 2.0.5 Requires: php-date Requires: php-pcre @@ -73,13 +87,11 @@ An API for various compression techniques. %prep %setup -q -c cd %{pear_name}-%{version} -%patch0 -p1 -b .pr1 # Don't install .po and .pot files # Remove checksum for .mo, as we regenerate them sed -e '/%{pear_name}.po/d' \ -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \ - -e '/role="test"/s/md5sum=.*name=/name=/' \ ../package.xml >%{name}.xml touch -r ../package.xml %{name}.xml @@ -116,9 +128,9 @@ done | tee ../%{pear_name}.lang cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php56 php70 php71 php72 php73; do if which $cmd; then - $cmd %{_bindir}/phpunit --verbose . || ret=1 + $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 fi done exit $ret @@ -145,6 +157,11 @@ fi %changelog +* Mon Feb 11 2019 Remi Collet - 2.2.2-1 +- update to 2.2.2 +- drop patch merged upstream +- use range dependencies + * Tue Nov 14 2017 Remi Collet - 2.2.1-2 - patch from https://github.com/horde/Compress/pull/1 -- cgit