summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-02-11 19:35:07 +0100
committerRemi Collet <fedora@famillecollet.com>2017-02-11 19:35:07 +0100
commit7636f774ed86b4cca161c1227b66af9326cff27d (patch)
treef448913a95a11d4320cc6bcdeb5500a12f59385c
parentc13bdab41099f51e132cccdd7851b85d40211fd2 (diff)
php-horde-Horde-Icalendar: 2.1.6
-rw-r--r--Horde_Icalendar-pr213.patch31
-rw-r--r--php-horde-Horde-Icalendar.spec10
2 files changed, 4 insertions, 37 deletions
diff --git a/Horde_Icalendar-pr213.patch b/Horde_Icalendar-pr213.patch
deleted file mode 100644
index 4b63001..0000000
--- a/Horde_Icalendar-pr213.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7daa8bb0e41a35337e3181001e980e99ffca745d Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Sat, 11 Feb 2017 18:53:57 +0100
-Subject: [PATCH] fix PHP 5.3 compatibility
-
----
- framework/Icalendar/lib/Horde/Icalendar.php | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/framework/Icalendar/lib/Horde/Icalendar.php b/framework/Icalendar/lib/Horde/Icalendar.php
-index ddb860d..ab5155b 100644
---- a/framework/Icalendar/lib/Horde/Icalendar.php
-+++ b/framework/Icalendar/lib/Horde/Icalendar.php
-@@ -1289,7 +1289,7 @@ function($a, $b) {
- if (!$b['end']) {
- return -1;
- }
-- return $this->_getEndDifference($a['end'], $b['end']);
-+ return Horde_Icalendar::_getEndDifference($a['end'], $b['end']);
- }
- );
-
-@@ -1365,7 +1365,7 @@ protected function _checkEndDate($t, $times)
- *
- * @return boolean True if $a < $b otherwise false.
- */
-- protected function _getEndDifference($a, $b)
-+ public static function _getEndDifference($a, $b)
- {
- if (strlen($a) == 4) {
- $a = @gmmktime(0, 0, 0, 1, 1, $a);
diff --git a/php-horde-Horde-Icalendar.spec b/php-horde-Horde-Icalendar.spec
index 585b910..db7522a 100644
--- a/php-horde-Horde-Icalendar.spec
+++ b/php-horde-Horde-Icalendar.spec
@@ -12,7 +12,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Icalendar
-Version: 2.1.5
+Version: 2.1.6
Release: 1%{?dist}
Summary: iCalendar API
@@ -21,9 +21,6 @@ License: LGPLv2
URL: http://pear.horde.org
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-# https://github.com/horde/horde/pull/213
-Patch0: %{pear_name}-pr213.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
@@ -66,13 +63,11 @@ An API for dealing with iCalendar data.
%prep
%setup -q -c
cd %{pear_name}-%{version}
-%patch0 -p3 -b .pr213
# Don't install .po and .pot files
# Remove checksum for .mo, as we regenerate them
sed -e '/%{pear_name}.po/d' \
-e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
- -e '/Icalendar.php/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
touch -r ../package.xml %{name}.xml
@@ -147,6 +142,9 @@ fi
%changelog
+* Sat Feb 11 2017 Remi Collet <remi@fedoraproject.org> - 2.1.6-1
+- Update to 2.1.6
+
* Sat Feb 11 2017 Remi Collet <remi@fedoraproject.org> - 2.1.5-1
- Update to 2.1.5
- open https://github.com/horde/horde/pull/213 - PHP 5.3 compatibility