summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-06-23 07:51:03 +0200
committerRemi Collet <remi@remirepo.net>2017-06-23 07:51:03 +0200
commitc43ccfe4f89c14c840269c260884b708d5e911c4 (patch)
tree23f618c0cd9ffbf1b7715e453a30744372ea0350
parent75db325efca9a74fccad3ad6191b0e30eb75c1fe (diff)
v1.2.5
-rw-r--r--.gitignore7
-rw-r--r--php-horde-Horde-ListHeaders.spec28
2 files changed, 22 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-horde-Horde-ListHeaders.spec b/php-horde-Horde-ListHeaders.spec
index fe5966a..357c24e 100644
--- a/php-horde-Horde-ListHeaders.spec
+++ b/php-horde-Horde-ListHeaders.spec
@@ -11,7 +11,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-ListHeaders
-Version: 1.2.4
+Version: 1.2.5
Release: 1%{?dist}
Summary: Horde List Headers Parsing Library
@@ -20,7 +20,6 @@ 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)
BuildArch: noarch
BuildRequires: gettext
BuildRequires: php-common >= 5.3.0
@@ -75,7 +74,6 @@ done
%install
cd %{pear_name}-%{version}
-rm -rf %{buildroot}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
# Clean up unnecessary files
@@ -93,17 +91,19 @@ do
done | tee ../%{pear_name}.lang
-%clean
-rm -rf %{buildroot}
-
-
%check
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-%{_bindir}/phpunit .
-
-if which php70; then
- php70 %{_bindir}/phpunit . || :
-fi
+ret=0
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ if %{_bindir}/phpunit --atleast-version 4.8; then
+ $cmd %{_bindir}/phpunit --verbose .
+ else
+ : PHPUnit is too old for this package
+ fi
+ fi
+done
+exit $ret
%post
@@ -118,7 +118,6 @@ fi
%files -f %{pear_name}.lang
-%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/ListHeaders
@@ -129,6 +128,9 @@ fi
%changelog
+* Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 1.2.5-1
+- Update to 1.2.5
+
* Tue Apr 05 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-1
- Update to 1.2.4