From e7694f847f2542384a73c54a313ae0d9bc4c935a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jul 16 2014 07:43:15 +0000 Subject: update to 2.0.4 --- diff --git a/.gitignore b/.gitignore index 98e90b1..ba62989 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /sabre-http-2.0.1.tar.gz /sabre-http-2.0.2.tar.gz /sabre-http-2.0.3.tar.gz +/sabre-http-2.0.4.tar.gz diff --git a/php-sabre-http.spec b/php-sabre-http.spec index 85db135..cbcd489 100644 --- a/php-sabre-http.spec +++ b/php-sabre-http.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 19ae509d699a388154547448b502cef5f19602ec +%global gh_commit c4c24f547a5509c6c661b11ecf4ff524d2bf6a44 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner fruux %global gh_project sabre-http @@ -15,8 +15,8 @@ Name: php-%{gh_project} Summary: Library for dealing with http requests and responses -Version: 2.0.3 -Release: 2%{?dist} +Version: 2.0.4 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}.tar.gz @@ -26,18 +26,21 @@ Group: Development/Libraries BuildArch: noarch %if %{with_tests} BuildRequires: php(language) > 5.4 -BuildRequires: php-pear(pear.phpunit.de/PHPUnit) -BuildRequires: php-sabre-event >= 1.0.0 -BuildRequires: php-sabre-event < 1.1 +BuildRequires: php-phpunit-PHPUnit +BuildRequires: php-composer(sabre/event) >= 1.0.0 +BuildRequires: php-composer(sabre/event) < 3 %endif # From composer.json +# "php" : ">=5.4", +# "ext-mbstring" : "*", +# "sabre/event" : ">=1.0.0,<3.0.0" Requires: php(language) > 5.4 Requires: php-curl Requires: php-mbstring -Requires: php-sabre-event >= 1.0.0 -Requires: php-sabre-event < 1.1 -# From phpcompatinfo report for version 1.0.0alpha5 +Requires: php-composer(sabre/event) >= 1.0.0 +Requires: php-composer(sabre/event) < 3 +# From phpcompatinfo report for version 2.0.4 Requires: php-ctype Requires: php-date Requires: php-pcre @@ -46,6 +49,8 @@ Requires: php-xml # Was split from php-sabre-dav in version 1.9 Conflicts: php-sabre-dav < 1.9 +Provides: php-composer(sabre/http) = %{version} + %description This library provides a toolkit to make working with the HTTP protocol easier. @@ -113,6 +118,10 @@ phpunit \ %changelog +* Wed Jul 16 2014 Remi Collet - 2.0.4-1 +- update to 2.0.4 +- composer dependencies + * Sat Jun 07 2014 Fedora Release Engineering - 2.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 62f2f95..fea73eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2fad1a954a49ee2f31a39a62ad1ca86 sabre-http-2.0.3.tar.gz +fa886a52c2aa3a714ce5ef16c77b3bb0 sabre-http-2.0.4.tar.gz