From c794b8926af2a130efd50f46cd944c83d1a09d56 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 1 Oct 2019 14:24:43 +0200 Subject: add patch for PHP 7.4 from https://github.com/horde/Compress/pull/2 --- php-horde-Horde-Compress.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'php-horde-Horde-Compress.spec') diff --git a/php-horde-Horde-Compress.spec b/php-horde-Horde-Compress.spec index 57c2ee1..2b376ce 100644 --- a/php-horde-Horde-Compress.spec +++ b/php-horde-Horde-Compress.spec @@ -13,13 +13,15 @@ Name: php-horde-Horde-Compress Version: 2.2.2 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Horde Compression API License: LGPLv2 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/horde/Compress/pull/2.patch + BuildArch: noarch BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) @@ -87,11 +89,13 @@ An API for various compression techniques. %prep %setup -q -c cd %{pear_name}-%{version} +%patch0 -p1 # 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 '/Rtf.php/s/md5sum=.*name=/name=/' \ ../package.xml >%{name}.xml touch -r ../package.xml %{name}.xml @@ -128,7 +132,7 @@ 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 php73; do +for cmd in php php71 php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 fi @@ -157,6 +161,10 @@ fi %changelog +* Tue Oct 1 2019 Remi Collet - 2.2.2-3 +- add patch for PHP 7.4 from + https://github.com/horde/Compress/pull/2 + * Mon Feb 11 2019 Remi Collet - 2.2.2-1 - update to 2.2.2 - drop patch merged upstream -- cgit