summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-11-04 08:14:09 +0100
committerRemi Collet <remi@remirepo.net>2019-11-04 08:14:09 +0100
commit36c6297014fd5744f9dcf6e7830ae1bcc3651d88 (patch)
treeb68eabee4a418565af58ca83ac7ee609cfba72b4
parentd65f30ed3b404a63f98ea5a20da2f62193395e5a (diff)
-rw-r--r--.gitignore8
-rw-r--r--php-horde-Horde-Kolab-Storage.spec73
2 files changed, 56 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-Horde-Kolab-Storage.spec b/php-horde-Horde-Kolab-Storage.spec
index 7f5a27c..a3cf96b 100644
--- a/php-horde-Horde-Kolab-Storage.spec
+++ b/php-horde-Horde-Kolab-Storage.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-horde-Horde-Kolab-Storage
#
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -17,16 +17,14 @@
%endif
Name: php-horde-Horde-Kolab-Storage
-Version: 2.2.3
+Version: 2.2.4
Release: 1%{?dist}
Summary: A package for handling Kolab data stored on an IMAP server
-Group: Development/Libraries
License: LGPLv2
URL: http://%{pear_channel}
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
@@ -34,12 +32,25 @@ BuildRequires: php-pear(PEAR) >= 1.7.0
BuildRequires: php-channel(%{pear_channel})
%if %{with_tests}
# To run unit tests
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 with php-pear(%{pear_channel}/Horde_Test) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Cache) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Cache) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Kolab_Format) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Kolab_Format) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Mime) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Translation) >= 2.2.0 with php-pear(%{pear_channel}/Horde_Translation) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Support) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Support) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Imap_Client) >= 2.14.0 with php-pear(%{pear_channel}/Horde_Imap_Client) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_History) >= 2.0.0 with php-pear(%{pear_channel}/Horde_History) < 3)
+%else
BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
BuildRequires: php-pear(%{pear_channel}/Horde_Cache) >= 2.0.0
BuildRequires: php-pear(%{pear_channel}/Horde_History) >= 2.0.0
BuildRequires: php-pear(%{pear_channel}/Horde_Imap_Client) >= 2.0.0
BuildRequires: php-pear(%{pear_channel}/Horde_Kolab_Format) >= 2.0.0
%endif
+%endif
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -50,6 +61,21 @@ Requires: php-json
Requires: php-pcre
Requires: php-spl
Requires: php-pear(PEAR) >= 1.7.0
+Requires: php-channel(%{pear_channel})
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-pear(%{pear_channel}/Horde_Cache) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Cache) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Kolab_Format) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Kolab_Format) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Mime) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Translation) >= 2.2.0 with php-pear(%{pear_channel}/Horde_Translation) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Support) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Support) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3)
+# Optional
+Recommends: (php-pear(%{pear_channel}/Horde_Imap_Client) >= 2.14.0 with php-pear(%{pear_channel}/Horde_Imap_Client) < 3)
+Recommends: (php-pear(%{pear_channel}/Horde_History) >= 2.0.0 with php-pear(%{pear_channel}/Horde_History) < 3)
+Recommends: php-pear(HTTP_Request)
+Recommends: php-pear(Net_IMAP) >= 1.1.0
+%else
Requires: php-pear(%{pear_channel}/Horde_Cache) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Cache) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
@@ -64,7 +90,6 @@ Requires: php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Support) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0
-Requires: php-channel(%{pear_channel})
# Optional
Requires: php-pear(%{pear_channel}/Horde_Imap_Client) >= 2.14.0
Requires: php-pear(%{pear_channel}/Horde_Imap_Client) < 3.0.0
@@ -72,6 +97,7 @@ Requires: php-pear(%{pear_channel}/Horde_History) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_History) < 3.0.0
Requires: php-pear(HTTP_Request)
Requires: php-pear(Net_IMAP) >= 1.1.0
+%endif
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
Provides: php-composer(horde/horde-kolab-storage) = %{version}
@@ -108,7 +134,6 @@ done
%install
-rm -rf %{buildroot}
cd %{pear_name}-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -141,32 +166,22 @@ sed -e "s/Horde_Kolab_Format_Xml-@version@/Horde_Kolab_Format_Xml-${VER}/" \
-i ComponentTest/Data/Object/Message/ModifiedTest.php \
ComponentTest/Data/Object/Message/NewTest.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
-if phpunit --atleast-version 4
-then %{_bindir}/phpunit --verbose .
+if phpunit --atleast-version 4; then
+ for cmd in php php56 php70 php71 php72 php73 php74; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1
+ fi
+ done
else : PHPUnit is too old
fi
-# remirepo:2
-fi
+
exit $ret
%else
: Test disabled, bootstrap build
%endif
-%clean
-rm -rf %{buildroot}
%post
@@ -181,17 +196,25 @@ fi
%files -f %{pear_name}.lang
-%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Kolab/Storage
%{pear_phpdir}/Horde/Kolab/Storage.php
%dir %{pear_datadir}/%{pear_name}
%dir %{pear_datadir}/%{pear_name}/locale
-%{pear_testdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
%changelog
+* Mon Nov 4 2019 Remi Collet <remi@remirepo.net> - 2.2.4-1
+- update to 2.2.4
+- drop patch merged upstream
+
+* Thu Oct 17 2019 Remi Collet <remi@remirepo.net> - 2.2.3-8
+- add patch for PHP 7.4 from
+ https://github.com/horde/Kolab_Storage/pull/1
+- use range dependencies
+
* Tue Dec 20 2016 Remi Collet <remi@fedoraproject.org> - 2.2.3-1
- Update to 2.2.3