From 3187e9fd436c416ce2e756b3f9f2e0ab9c2d7d37 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 May 2014 09:29:53 +0200 Subject: php-sabre-dav: 1.8.10 --- php-sabre-dav.spec | 13 ++++++++----- sabre-dav-autoload.patch | 9 +++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/php-sabre-dav.spec b/php-sabre-dav.spec index d9922c6..c699a6d 100644 --- a/php-sabre-dav.spec +++ b/php-sabre-dav.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 25e095469e44d195cd255bdce55ce473224558bc +%global gh_commit 0d064536ed3c7974e486b6ebb5b17ad7a974fe18 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner fruux %global gh_project sabre-dav @@ -14,7 +14,7 @@ Name: php-%{gh_project} Summary: WebDAV Framework for PHP -Version: 1.8.9 +Version: 1.8.10 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -29,9 +29,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.3.1 -BuildRequires: php-pear(pear.phpunit.de/PHPUnit) > 3.7 +BuildRequires: %{_bindir}/phpunit BuildRequires: php-sabre-vobject > 2.1 -Requires: php-pdo +BuildRequires: php-pdo %endif # From composer.json @@ -127,11 +127,14 @@ phpunit \ %files %defattr(-,root,root,-) %doc ChangeLog composer.json LICENSE README.md -%doc docs examples bin +%doc examples bin %{_datadir}/php/Sabre %changelog +* Thu May 22 2014 Remi Collet - 1.8.10-1 +- update to 1.8.10 + * Sun Mar 2 2014 Remi Collet - 1.8.9-1 - update to 1.8.9 diff --git a/sabre-dav-autoload.patch b/sabre-dav-autoload.patch index 1aa22db..b5ddca6 100644 --- a/sabre-dav-autoload.patch +++ b/sabre-dav-autoload.patch @@ -1,9 +1,10 @@ ---- lib/Sabre/autoload.php.old 2013-12-31 17:54:12.000000000 +0100 -+++ lib/Sabre/autoload.php 2013-12-31 17:58:28.000000000 +0100 +diff -up lib/Sabre/autoload.php.orig lib/Sabre/autoload.php +--- lib/Sabre/autoload.php.orig 2014-05-22 09:19:59.914874236 +0200 ++++ lib/Sabre/autoload.php 2014-05-22 09:21:26.300242963 +0200 @@ -15,11 +15,9 @@ - * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License + * @license http://sabre.io/license/ Modified BSD License */ - + -/** - * We are assuming that the composer autoloader is just 2 directories up. - * -- cgit