summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-05-06 17:04:49 +0200
committerRemi Collet <fedora@famillecollet.com>2014-05-06 17:04:49 +0200
commit01670eb3eca60b4f6d4879e6e49aa6eb8c2fd1b7 (patch)
tree875c67ec69a627718b8a03ba49537313a4be2790
parent48ad3dfffc1b485837169bf20006fc564e41ca12 (diff)
php-sabre-vobject: 3.2.1
-rw-r--r--php-sabre-vobject.spec14
1 files changed, 10 insertions, 4 deletions
diff --git a/php-sabre-vobject.spec b/php-sabre-vobject.spec
index 5a4932d..16e2940 100644
--- a/php-sabre-vobject.spec
+++ b/php-sabre-vobject.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit dd1dd19b6601cdc99408b70ec260052825f70b8f
+%global gh_commit 48db24f6a8ef3943b7283c6a8aaf9ec6b797283d
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner fruux
%global gh_project sabre-vobject
@@ -14,7 +14,7 @@
Name: php-%{gh_project}
Summary: Library to parse and manipulate iCalendar and vCard objects
-Version: 3.2.0
+Version: 3.2.1
Release: 1%{?dist}
URL: https://github.com/%{gh_owner}/%{gh_project}
@@ -85,8 +85,11 @@ install -Dpm 0755 bin/vobject \
%check
%if %{with_tests}
-sed -e s/testGetDateTime/SKIP_testGetDateTime/ \
- -i tests/Sabre/VObject/Property/VCard/DateAndOrTimeTest.php
+%if "%{php_version}" < "5.5"
+# Broken by change in json_encode in 5.4.28
+sed -e 's/function testConvertJCardPretty/function SKIP_testConvertJCardPretty/' \
+ -i tests/Sabre/VObject/CliTest.php
+%endif
: Run upstream test suite against installed library
cd tests
@@ -107,6 +110,9 @@ phpunit \
%changelog
+* Tue May 6 2014 Remi Collet <remi@fedoraproject.org> - 3.2.1-1
+- update to 3.2.1
+
* Sun Apr 6 2014 Remi Collet <remi@fedoraproject.org> - 3.2.0-1
- update to 3.2.0