summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-10-10 06:19:28 +0200
committerRemi Collet <remi@remirepo.net>2017-10-10 06:19:28 +0200
commit6db5e3b13ff6cc11b1fa60feff9745eface82727 (patch)
tree5c42446a086988069815b992781e493a6a783121
parent27566017c6211809956041d51c246f68f62b2038 (diff)
-rw-r--r--.gitignore8
-rw-r--r--php-horde-Horde-Share.spec28
2 files changed, 18 insertions, 18 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-Horde-Share.spec b/php-horde-Horde-Share.spec
index 6d0c6ca..d547b4b 100644
--- a/php-horde-Horde-Share.spec
+++ b/php-horde-Horde-Share.spec
@@ -11,7 +11,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Share
-Version: 2.1.2
+Version: 2.2.0
Release: 1%{?dist}
Summary: Horde Shared Permissions System
@@ -20,7 +20,6 @@ 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
@@ -113,21 +112,12 @@ done | tee ../%{pear_name}.lang
%check
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-# 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
@@ -143,16 +133,18 @@ fi
%files -f %{pear_name}.lang
-%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Share
-%{pear_testdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
%dir %{pear_datadir}/%{pear_name}
%dir %{pear_datadir}/%{pear_name}/locale
%changelog
+* Tue Oct 10 2017 Remi Collet <remi@remirepo.net> - 2.2.0-1
+- Update to 2.2.0
+
* Mon Feb 27 2017 Remi Collet <remi@fedoraproject.org> - 2.1.2-1
- Update to 2.1.2