summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--php-horde-kronolith.spec30
2 files changed, 16 insertions, 21 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-kronolith.spec b/php-horde-kronolith.spec
index a7a27c0..84f4bc9 100644
--- a/php-horde-kronolith.spec
+++ b/php-horde-kronolith.spec
@@ -11,7 +11,7 @@
%global pear_channel pear.horde.org
Name: php-horde-kronolith
-Version: 4.2.20
+Version: 4.2.21
Release: 1%{?dist}
Summary: A web based calendar
@@ -20,7 +20,6 @@ License: GPLv2
URL: http://www.horde.org/apps/kronolith
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
@@ -208,25 +207,12 @@ done | tee ../%{pear_name}.lang
%check
cd %{pear_name}-%{version}/test/Kronolith
-# Timezone issue (need investigation, fail in mock only)
-rm Integration/ToIcalendarTest.php
-rm Integration/FromIcalendarTest.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
@@ -242,7 +228,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
@@ -273,6 +258,9 @@ fi
%changelog
+* Wed May 3 2017 Remi Collet <remi@remirepo.net> - 4.2.21-1
+- Update to 4.2.21
+
* Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 4.2.20-1
- Update to 4.2.20