From 5bf1806b0f4f95c96f10faba465d2e360ec2324e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 23 Jun 2017 07:48:55 +0200
Subject: v1.1.4

---
 .gitignore                            |  7 ++++++
 php-horde-Horde-JavascriptMinify.spec | 40 +++++++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore

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-Horde-JavascriptMinify.spec b/php-horde-Horde-JavascriptMinify.spec
index bfa56d9..cbf7d13 100644
--- a/php-horde-Horde-JavascriptMinify.spec
+++ b/php-horde-Horde-JavascriptMinify.spec
@@ -9,9 +9,10 @@
 %{!?__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
+Version:        1.1.4
 Release:        1%{?dist}
 Summary:        Javascript Minification
 
@@ -20,11 +21,18 @@ License:        LGPLv2
 URL:            http://pear.horde.org/
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 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}
@@ -63,7 +71,6 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
@@ -74,8 +81,25 @@ mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
-%clean
-rm -rf %{buildroot}
+%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
+    if %{_bindir}/phpunit --atleast-version 4.8; then
+      $cmd %{_bindir}/phpunit --verbose .
+    else
+     : PHPUnit is too old for this package
+    fi
+  fi
+done
+exit $ret
+%else
+: bootstrap build with test suite disabled
+%endif
 
 
 %post
@@ -90,14 +114,18 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{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 <remi@remirepo.net> - 1.1.4-1
+- Update to 1.1.4
+- enable test suite
+
 * Wed Mar 09 2016 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
 - Update to 1.1.3
 
-- 
cgit