[php-sabre-vobject] update to 3.1.3

[Remi Collet]

commit 04133fbbf7594b2419b079b2187d5359ffe93258
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Feb 20 12:54:58 2014 +0100

    update to 3.1.3

 .gitignore                                         |    1 +
 php-sabre-vobject.spec                             |   17 +++++++++--------
 sabre-vobject-cmd.patch => sabre-vobject-bin.patch |   12 ++++++++----
 sources                                            |    2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57e756b..48e6051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sabre-vobject-2.1.3.tar.gz
+/sabre-vobject-3.1.3.tar.gz
diff --git a/php-sabre-vobject.spec b/php-sabre-vobject.spec
index 5420b47..a2c4104 100644
--- a/php-sabre-vobject.spec
+++ b/php-sabre-vobject.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e46d6855cfef23318e7c422cd08d36e344624675
+%global gh_commit    961546d71c332ab34ad1c5bba7f372c08b388dcf
 %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:        2.1.3
+Version:        3.1.3
 Release:        1%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -23,9 +23,8 @@ License:        BSD
 Group:          Development/Libraries
 
 # replace composer autloader by PSR-O trivial one
-Patch0:         %{gh_project}-cmd.patch
+Patch0:         %{gh_project}-bin.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.3.1
@@ -76,8 +75,8 @@ mkdir -p %{buildroot}%{_datadir}/php
 cp -pr lib/Sabre %{buildroot}%{_datadir}/php/Sabre
 
 # Install the command
-install -Dpm 0755 bin/vobjectvalidate.php \
-         %{buildroot}/%{_bindir}/vobjectvalidate
+install -Dpm 0755 bin/vobject \
+         %{buildroot}/%{_bindir}/vobject
 
 
 %check
@@ -94,12 +93,14 @@ phpunit \
 
 
 %files
-%defattr(-,root,root,-)
 %doc ChangeLog composer.json LICENSE README.md
 %{_datadir}/php/Sabre
-%{_bindir}/vobjectvalidate
+%{_bindir}/vobject
 
 
 %changelog
+* Thu Feb 20 2014 Remi Collet <remi at fedoraproject.org> - 3.1.3-1
+- update to 3.1.3
+
 * Tue Dec 31 2013 Remi Collet <remi at fedoraproject.org> - 2.1.3-1
 - Initial packaging
\ No newline at end of file
diff --git a/sabre-vobject-cmd.patch b/sabre-vobject-bin.patch
similarity index 76%
rename from sabre-vobject-cmd.patch
rename to sabre-vobject-bin.patch
index 8f03e54..3185e6e 100644
--- a/sabre-vobject-cmd.patch
+++ b/sabre-vobject-bin.patch
@@ -1,6 +1,6 @@
---- bin/vobjectvalidate.php.old	2013-12-31 17:24:11.000000000 +0100
-+++ bin/vobjectvalidate.php	2013-12-31 17:24:27.000000000 +0100
-@@ -1,21 +1,18 @@
+--- bin/vobject.old	2013-12-31 16:24:36.000000000 +0100
++++ bin/vobject	2013-12-31 16:32:00.000000000 +0100
+@@ -1,24 +1,21 @@
 -#!/usr/bin/env php
 +#!/usr/bin/php
  <?php
@@ -30,4 +30,8 @@
 +});
  
  if (!class_exists('Sabre\\VObject\\Version')) {
-     fwrite(STDERR, "Composer autoloader could not be properly loaded.\n");
+-    fwrite(STDERR, "Composer autoloader could not be properly loaded.\n");
++    fwrite(STDERR, "Autoloader could not be properly loaded.\n");
+     die(1);
+ }
+ 
diff --git a/sources b/sources
index 155b2bb..c915892 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1066b17f2c211cb568d53e6d975e1a07  sabre-vobject-2.1.3.tar.gz
+54eba78297db6a4e6f852f11ad6d7b6b  sabre-vobject-3.1.3.tar.gz