diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | php-horde-passwd.spec | 39 |
2 files changed, 22 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-horde-passwd.spec b/php-horde-passwd.spec index c10e466..7ea60fb 100644 --- a/php-horde-passwd.spec +++ b/php-horde-passwd.spec @@ -9,12 +9,11 @@ %{!?__pear: %global __pear %{_bindir}/pear} %global pear_name passwd %global pear_channel pear.horde.org -# disabled as not ready -%global with_tests %{?_with_tests:1}%{!?_with_tests:0} +%global with_tests 0%{!?_with_tests:1} Name: php-horde-passwd -Version: 5.0.6 -Release: 2%{?dist} +Version: 5.0.7 +Release: 1%{?dist} Summary: Horde password changing application Group: Development/Libraries @@ -22,7 +21,6 @@ License: GPLv2 URL: http://www.horde.org/apps/passwd 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 @@ -48,7 +46,7 @@ Requires: php-pear(%{pear_channel}/horde) >= 5.0.0 Requires: php-pear(%{pear_channel}/horde) < 6.0.0 Requires: php-pear(%{pear_channel}/Horde_Auth) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Auth) < 3.0.0 -Requires: php-pear(%{pear_channel}/Horde_Core) >= 2.11.0 +Requires: php-pear(%{pear_channel}/Horde_Core) >= 2.30.0 Requires: php-pear(%{pear_channel}/Horde_Core) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 @@ -107,7 +105,6 @@ done %install cd %{pear_name}-%{version} -rm -rf %{buildroot} %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files @@ -133,29 +130,18 @@ do done | tee ../%{pear_name}.lang -%clean -rm -rf %{buildroot} %check %if %{with_tests} cd %{pear_name}-%{version}/test/Passwd -# 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 @@ -174,7 +160,6 @@ fi %files -f %{pear_name}.lang -%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %attr(0770,apache,apache) %dir %{_sysconfdir}/horde/%{pear_name} @@ -191,10 +176,14 @@ fi %{pear_hordedir}/%{pear_name}/templates %{pear_hordedir}/%{pear_name}/themes %dir %{pear_hordedir}/%{pear_name}/locale -%{pear_testdir}/%{pear_name} +%doc %{pear_testdir}/%{pear_name} %changelog +* Thu Sep 21 2017 Remi Collet <remi@remirepo.net> - 5.0.7-1 +- Update to 5.0.7 +- enable test suite + * Tue Dec 20 2016 Remi Collet <remi@fedoraproject.org> - 5.0.6-2 - Update to 5.0.6 - use upstream locale files |