summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--php-horde-ingo.spec37
2 files changed, 19 insertions, 25 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-ingo.spec b/php-horde-ingo.spec
index 82cc003..34da6f9 100644
--- a/php-horde-ingo.spec
+++ b/php-horde-ingo.spec
@@ -12,7 +12,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-horde-ingo
-Version: 3.2.14
+Version: 3.2.15
Release: 1%{?dist}
Summary: An email filter rules manager
@@ -21,7 +21,6 @@ License: BSD
URL: http://www.horde.org/apps/ingo
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
BuildRequires: php(language) >= 5.3.0
@@ -124,7 +123,6 @@ done
%install
-rm -rf %{buildroot}
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -156,34 +154,21 @@ done | tee ../%{pear_name}.lang
%if %{with_tests}
cd %{pear_name}-%{version}/test/Ingo
-# 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
-if %{_bindir}/phpunit --atleast-version 4
-then %{_bindir}/phpunit --verbose .
-else : PHPUnit is too old
-fi
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ if $cmd %{_bindir}/phpunit --atleast-version 4
+ then $cmd %{_bindir}/phpunit --verbose .
+ else : PHPUnit is too old
+ fi
+ fi
+done
exit $ret
%else
: tests disabled
%endif
-%clean
-rm -rf %{buildroot}
-
-
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -196,7 +181,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
@@ -221,6 +205,9 @@ fi
%changelog
+* Wed May 3 2017 Remi Collet <remi@remirepo.net> - 3.2.15-1
+- Update to 3.2.15
+
* Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 3.2.14-1
- Update to 3.2.14