diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | php-horde-nag.spec | 28 |
2 files changed, 17 insertions, 18 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-nag.spec b/php-horde-nag.spec index dd1648e..0830f8e 100644 --- a/php-horde-nag.spec +++ b/php-horde-nag.spec @@ -11,7 +11,7 @@ %global pear_channel pear.horde.org Name: php-horde-nag -Version: 4.2.14 +Version: 4.2.15 Release: 1%{?dist} Summary: A web based task list manager @@ -20,7 +20,6 @@ License: GPLv2 URL: http://www.horde.org/apps/nag Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: gettext BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -170,21 +169,12 @@ done | tee ../%{pear_name}.lang %check cd %{pear_name}-%{version}/test/Nag -# 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 @@ -200,7 +190,6 @@ fi %files -f %{pear_name}.lang -%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{name}.xml %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf @@ -208,7 +197,7 @@ fi %attr(0640,apache,apache) %config %{_sysconfdir}/horde/%{pear_name}/*.dist %attr(0660,apache,apache) %config(noreplace) %{_sysconfdir}/horde/%{pear_name}/*.php %attr(0660,apache,apache) %config %{_sysconfdir}/horde/%{pear_name}/*.xml -%{pear_testdir}/%{pear_name} +%doc %{pear_testdir}/%{pear_name} %{_bindir}/nag-convert-datatree-shares-to-sql %{_bindir}/nag-convert-sql-shares-to-sqlng %{_bindir}/nag-create-missing-add-histories-sql @@ -230,6 +219,9 @@ fi %changelog +* Tue Aug 1 2017 Remi Collet <remi@remirepo.net> - 4.2.15-1 +- Update to 4.2.15 + * Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 4.2.14-1 - Update to 4.2.14 |