From 54bc2eb5d567c9d8a53a6bfa634ee3761bb232a4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Oct 2018 08:37:18 +0200 Subject: add patch for PHP 7.3 from https://github.com/horde/Text_Filter/pull/1 --- php-horde-Horde-Text-Filter.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'php-horde-Horde-Text-Filter.spec') diff --git a/php-horde-Horde-Text-Filter.spec b/php-horde-Horde-Text-Filter.spec index 49f6e3f..3fca19f 100644 --- a/php-horde-Horde-Text-Filter.spec +++ b/php-horde-Horde-Text-Filter.spec @@ -13,7 +13,7 @@ Name: php-horde-Horde-Text-Filter Version: 2.3.5 -Release: 1%{?dist} +Release: 6%{?dist} Summary: Horde Text Filter API Group: Development/Libraries @@ -21,6 +21,9 @@ License: LGPLv2 URL: http://%{pear_channel}/ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz +# from https://github.com/horde/Text_Filter/pull/1 +Patch0: https://github.com/horde/Text_Filter/commit/4345913413bf411db8f4a758221e865c5fd6e4bd.patch + BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -63,11 +66,14 @@ Common methods for fitering and converting text. %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 '/Horde_Other.po/d' \ + -e '/Emails.php/s/md5sum=.*name=/name=/' \ + -e '/Linkurls.php/s/md5sum=.*name=/name=/' \ -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \ ../package.xml >%{name}.xml touch -r ../package.xml %{name}.xml @@ -116,7 +122,7 @@ sed -e 's/testMsoNormalCss/SKIP_testMsoNormalCss/' \ %endif 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 fi @@ -148,6 +154,9 @@ fi %changelog +* Mon Oct 15 2018 Remi Collet - 2.3.5-6 +- add patch for PHP 7.3 from https://github.com/horde/Text_Filter/pull/1 + * Wed Sep 07 2016 Remi Collet - 2.3.5-1 - Update to 2.3.5 -- cgit