summaryrefslogtreecommitdiffstats
path: root/php-horde-Horde-Image.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-horde-Horde-Image.spec')
-rw-r--r--php-horde-Horde-Image.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/php-horde-Horde-Image.spec b/php-horde-Horde-Image.spec
index 883e55e..1724abf 100644
--- a/php-horde-Horde-Image.spec
+++ b/php-horde-Horde-Image.spec
@@ -14,13 +14,15 @@
Name: php-horde-Horde-Image
Version: 2.6.0
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: Horde Image API
License: GPLv2+ and LGPLv2
URL: http://pear.horde.org
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
+Patch0: https://patch-diff.githubusercontent.com/raw/horde/Image/pull/3.patch
+
BuildArch: noarch
BuildRequires: gettext
BuildRequires: php(language) >= 5.3.0
@@ -91,11 +93,13 @@ Optional dependency: php-pecl-imagick
%setup -q -c
cd %{pear_name}-%{version}
+%patch0 -p1 -b .pr3
# Don't install .po and .pot files
# Remove checksum for .mo, as we regenerate them
sed -e '/%{pear_name}.po/d' \
-e '/.htaccess/d' \
+ -e '/Gps.php/s/md5sum=.*name=/name=/' \
-e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
touch -r ../package.xml %{name}.xml
@@ -134,7 +138,7 @@ done | tee ../%{pear_name}.lang
%if %{with_tests}
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
ret=0
-for cmd in php 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
@@ -167,6 +171,10 @@ fi
%changelog
+* Thu Oct 17 2019 Remi Collet <remi@remirepo.net> - 2.6.0-4
+- add patch for PHP 7.4 from
+ https://github.com/horde/Image/pull/3
+
* Mon Jan 14 2019 Remi Collet <remi@remirepo.net> - 2.6.0-1
- update to 2.6.0