From 106c5fe06e7a363cb89d8b0ee8f76c41de6f65f1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 May 2017 15:12:51 +0200 Subject: v2.4.0 --- .gitignore | 7 +++++++ php-horde-Horde-Date.spec | 26 +++++++++----------------- 2 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 .gitignore 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-Date.spec b/php-horde-Horde-Date.spec index 89ee541..7e99779 100644 --- a/php-horde-Horde-Date.spec +++ b/php-horde-Horde-Date.spec @@ -18,7 +18,7 @@ %endif Name: php-horde-Horde-Date -Version: 2.3.2 +Version: 2.4.0 Release: 1%{?dist} Summary: Horde Date package @@ -27,7 +27,6 @@ License: LGPLv2 URL: http://%{pear_channel} Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -111,21 +110,12 @@ done | tee ../%{pear_name}.lang %if %{with_tests} 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 --verbose . || ret=1 + fi +done exit $ret %else : Test disabled, missing '--with tests' option. @@ -143,7 +133,6 @@ if [ $1 -eq 0 ] ; then fi %files -f %{pear_name}.lang -%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Horde/Date @@ -154,6 +143,9 @@ fi %changelog +* Tue May 30 2017 Remi Collet - 2.4.0-1 +- Update to 2.4.0 + * Tue Dec 20 2016 Remi Collet - 2.3.2-1 - Update to 2.3.2 -- cgit