From 1ea98747a799bf603f6a2e2c2027f8c45a908433 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 11 Feb 2017 19:05:17 +0100 Subject: php-horde-Horde-Icalendar: add patch for PHP 5.3 --- php-horde-Horde-Icalendar.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'php-horde-Horde-Icalendar.spec') diff --git a/php-horde-Horde-Icalendar.spec b/php-horde-Horde-Icalendar.spec index 95b91f0..a0027ac 100644 --- a/php-horde-Horde-Icalendar.spec +++ b/php-horde-Horde-Icalendar.spec @@ -21,6 +21,9 @@ License: LGPLv2 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz +# https://github.com/horde/horde/pull/213 +Patch0: %{pear_name}-pr213.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: php(language) >= 5.3.0 @@ -63,11 +66,13 @@ An API for dealing with iCalendar data. %prep %setup -q -c cd %{pear_name}-%{version} +%patch0 -p3 -b .pr213 # 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 '/Icalendar.php/s/md5sum=.*name=/name=/' \ ../package.xml >%{name}.xml touch -r ../package.xml %{name}.xml @@ -102,6 +107,11 @@ done | tee ../%{pear_name}.lang %check cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) +%if 0%{?rhel} == 6 +sed -e 's/testLineFolding/SKIP_testLineFolding/' \ + -i ExportTest.php +%endif + ret=0 for cmd in php56 php70 php71 php; do if which $cmd; then @@ -136,6 +146,7 @@ fi %changelog * Sat Feb 11 2017 Remi Collet - 2.1.5-1 - Update to 2.1.5 +- open https://github.com/horde/horde/pull/213 - PHP 5.3 compatibility * Mon Mar 21 2016 Remi Collet - 2.1.4-1 - Update to 2.1.4 -- cgit