summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--395.patch21
-rw-r--r--composer.json2
-rw-r--r--php-sabre-vobject4.spec17
3 files changed, 10 insertions, 30 deletions
diff --git a/395.patch b/395.patch
deleted file mode 100644
index 0e6c5a7..0000000
--- a/395.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f70b5b5c7113c8781c1fb208a89093315be942da Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 30 Oct 2017 13:21:53 +0100
-Subject: [PATCH] Canada/East-Saskatchewan removed in 2017.3
-
----
- lib/timezonedata/php-bc.php | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/timezonedata/php-bc.php b/lib/timezonedata/php-bc.php
-index 906ccb0e..83f38f50 100644
---- a/lib/timezonedata/php-bc.php
-+++ b/lib/timezonedata/php-bc.php
-@@ -68,7 +68,6 @@
- 'Brazil/West',
- 'Canada/Atlantic',
- 'Canada/Central',
-- 'Canada/East-Saskatchewan',
- 'Canada/Eastern',
- 'Canada/Mountain',
- 'Canada/Newfoundland',
diff --git a/composer.json b/composer.json
index 1f22f6d..2407cab 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
"sabre/xml" : ">=1.5 <3.0"
},
"require-dev" : {
- "phpunit/phpunit" : "> 4.8, <6.0.0",
+ "phpunit/phpunit" : "> 4.8.35, <6.0.0",
"sabre/cs" : "^1.0.0"
},
diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec
index 683a55d..20fdab3 100644
--- a/php-sabre-vobject4.spec
+++ b/php-sabre-vobject4.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit df9916813d1d83e4f761c4cba13361ee74196fac
+%global gh_commit 6484b9d660822c5e221c76122ce8ea658ecc9c5b
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sabre-io
%global gh_project vobject
@@ -20,8 +20,8 @@
Name: php-sabre-vobject4
Summary: Library to parse and manipulate iCalendar and vCard objects
-Version: 4.1.3
-Release: 2%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
URL: http://sabre.io/vobject/
License: BSD
@@ -31,7 +31,6 @@ Source1: %{name}-autoload.php
# replace composer autloader
Patch0: %{name}-bin.patch
-Patch1: https://patch-diff.githubusercontent.com/raw/sabre-io/vobject/pull/395.patch
BuildArch: noarch
%if %{with_tests}
@@ -45,10 +44,10 @@ BuildRequires: php-pcre
BuildRequires: php-spl
BuildRequires: php-xml
# From composer.json, "require-dev"
-# "phpunit/phpunit" : "> 4.8, <6.0.0",
+# "phpunit/phpunit" : "> 4.8.35, <6.0.0",
# "squizlabs/php_codesniffer": "*"
# "sabre/cs" : "^1.0.0"
-BuildRequires: php-composer(phpunit/phpunit) > 4.8
+BuildRequires: php-composer(phpunit/phpunit) > 4.8.35
# Autoloader
BuildRequires: php-composer(fedora/autoloader)
%endif
@@ -91,7 +90,6 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php
%setup -q -n %{gh_project}-%{gh_commit}
%patch0 -p1 -b .rpm
-%patch1 -p1 -b .pr395
cp %{SOURCE1} lib/autoload.php
@@ -145,8 +143,11 @@ exit $ret
%endif
%changelog
+* Sat Dec 23 2017 Remi Collet <remi@remirepo.net> - 4.1.4-1
+- Update to 4.1.4
+
* Mon Oct 30 2017 Remi Collet <remi@remirepo.net> - 4.1.3-2
-- fix FTBFS fro mKoschei, add patch for test from
+- fix FTBFS from Koschei, add patch for test from
https://github.com/sabre-io/vobject/pull/395
* Thu Oct 19 2017 Remi Collet <remi@remirepo.net> - 4.1.3-1