summaryrefslogtreecommitdiffstats
path: root/php-horde-Horde-Date-Parser.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-10-13 12:59:47 +0200
committerRemi Collet <remi@remirepo.net>2017-10-13 12:59:47 +0200
commite1c6ea99720ec4f1f22eca2b28e3fc420ef26c68 (patch)
tree20aa6e61890b2fb7c580c32532ceabb408b5bb7c /php-horde-Horde-Date-Parser.spec
parent2bf0fe79bcfa9d5ed9cdced1fca331e6ed9d6239 (diff)
add upstream patch for PHP 7.2, FTBFS from Koschei
Diffstat (limited to 'php-horde-Horde-Date-Parser.spec')
-rw-r--r--php-horde-Horde-Date-Parser.spec37
1 files changed, 17 insertions, 20 deletions
diff --git a/php-horde-Horde-Date-Parser.spec b/php-horde-Horde-Date-Parser.spec
index 23c023a..6cba16f 100644
--- a/php-horde-Horde-Date-Parser.spec
+++ b/php-horde-Horde-Date-Parser.spec
@@ -12,7 +12,7 @@
Name: php-horde-Horde-Date-Parser
Version: 2.0.6
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: Horde Date Parser
Group: Development/Libraries
@@ -20,7 +20,8 @@ License: LGPLv2
URL: http://pear.horde.org
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: https://github.com/horde/Date_Parser/commit/b452b5aa962b21316492c762639b6b4b659c8c6e.patch
+
BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
BuildRequires: php-pear(PEAR) >= 1.7.0
@@ -54,9 +55,12 @@ languages and locales
%prep
%setup -q -c
-
cd %{pear_name}-%{version}
-mv ../package.xml %{name}.xml
+%patch0 -p1 -b .upstream
+
+sed -e '/Parser/s/md5sum=.*name=/name=/' \
+ ../package.xml >%{name}.xml
+touch -r ../package.xml %{name}.xml
%build
@@ -79,21 +83,12 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
%check
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-# remirepo:11
-run=0
ret=0
-if which php56; then
- php56 %{_bindir}/phpunit . || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit . || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --verbose .
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit . || ret=1
+ fi
+done
exit $ret
@@ -109,15 +104,17 @@ fi
%files
-%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Date/Parser
%{pear_phpdir}/Horde/Date/Parser.php
-%{pear_testdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
%changelog
+* Fri Oct 13 2017 Remi Collet <remi@remirepo.net> - 2.0.6-4
+- add upstream patch for PHP 7.2, FTBFS from Koschei
+
* Wed Jul 13 2016 Remi Collet <remi@fedoraproject.org> - 2.0.6-1
- Update to 2.0.6