diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | php-horde-imp.spec | 33 |
2 files changed, 16 insertions, 24 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-imp.spec b/php-horde-imp.spec index 4f8fd9e..81596c3 100644 --- a/php-horde-imp.spec +++ b/php-horde-imp.spec @@ -11,7 +11,7 @@ %global pear_channel pear.horde.org Name: php-horde-imp -Version: 6.2.18 +Version: 6.2.19 Release: 1%{?dist} Summary: A web based webmail system @@ -21,7 +21,6 @@ License: GPLv2 and MIT URL: http://www.horde.org/apps/imp 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 @@ -181,7 +180,6 @@ done %install cd %{pear_name}-%{version} -rm -rf %{buildroot} %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files @@ -210,31 +208,16 @@ done | tee ../%{pear_name}.lang %check cd %{pear_name}-%{version}/test/Imp -# Ignore this one - Need investigation -rm Unit/Mime/Viewer/ItipTest.php -# 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 -%clean -rm -rf %{buildroot} - - %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : @@ -247,7 +230,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 @@ -272,6 +254,9 @@ fi %changelog +* Wed May 3 2017 Remi Collet <remi@remirepo.net> - 6.2.19-1 +- Update to 6.2.19 + * Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 6.2.18-1 - Update to 6.2.18 |