diff --git a/.gitignore b/.gitignore index a1f2f0b..20bea76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /Horde_JavascriptMinify-1.1.2.tgz /Horde_JavascriptMinify-1.1.3.tgz +/Horde_JavascriptMinify-1.1.4.tgz diff --git a/php-horde-Horde-JavascriptMinify.spec b/php-horde-Horde-JavascriptMinify.spec index 800465a..b0b5250 100644 --- a/php-horde-Horde-JavascriptMinify.spec +++ b/php-horde-Horde-JavascriptMinify.spec @@ -1,19 +1,19 @@ # remirepo/fedora spec file for php-horde-Horde-JavascriptMinify # -# Copyright (c) 2014-2016 Remi Collet +# Copyright (c) 2014-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %global __pear %{_bindir}/pear} %global pear_name Horde_JavascriptMinify %global pear_channel pear.horde.org +%global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-horde-Horde-JavascriptMinify -Version: 1.1.3 -Release: 2%{?dist} +Version: 1.1.4 +Release: 1%{?dist} Summary: Javascript Minification Group: Development/Libraries @@ -25,6 +25,14 @@ BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) +%if %{with_tests} +# To run unit tests +BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.2.7 +BuildRequires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 +BuildRequires: php-pear(%{pear_channel}/Horde_Log) >= 2.0.0 +BuildRequires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 +%endif + Requires(post): %{__pear} Requires(postun): %{__pear} @@ -73,6 +81,23 @@ mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} +%check +%if %{with_tests} +export LANG=fr_FR.utf8 +cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) + +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose . || ret=1 + fi +done +exit $ret +%else +: bootstrap build with test suite disabled +%endif + + %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{name}.xml >/dev/null || : @@ -89,9 +114,14 @@ fi %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Horde/JavascriptMinify/ %{pear_phpdir}/Horde/JavascriptMinify.php +%doc %{pear_testdir}/%{pear_name} %changelog +* Fri Jun 23 2017 Remi Collet - 1.1.4-1 +- Update to 1.1.4 +- enable test suite + * Sat Feb 11 2017 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -112,4 +142,4 @@ fi - Update to 1.1.1 * Tue Jul 8 2014 Remi Collet - 1.0.0-1 -- Initial package, version 1.0.0 \ No newline at end of file +- Initial package, version 1.0.0 diff --git a/sources b/sources index 2e28c7a..4f1986a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cfb364f3cfc153f387dfdff293447ef Horde_JavascriptMinify-1.1.3.tgz +SHA512 (Horde_JavascriptMinify-1.1.4.tgz) = 2d79c25f7a051994ed9b002c5d5d61923a3aa88eb491614617b6b478b676dd4a5dd27c9943f03fb1bc1f0e48771b3e3b042adb7a797ab469709632ddb8f99dfb