[php-sabredav-Sabre_VObject] Update to 2.1.0

[Joseph Marrero]

commit 3d81da56fde6a44960e110d07bd840b4efd9cdef
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Tue Sep 3 19:05:24 2013 -0400

    Update to 2.1.0

 php-sabredav-Sabre_VObject.spec |   80 +++++++++++++++++++++++++-------------
 1 files changed, 52 insertions(+), 28 deletions(-)
---
diff --git a/php-sabredav-Sabre_VObject.spec b/php-sabredav-Sabre_VObject.spec
index 2f17267..ef0e1bb 100644
--- a/php-sabredav-Sabre_VObject.spec
+++ b/php-sabredav-Sabre_VObject.spec
@@ -1,16 +1,23 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name %(echo %{name} | sed -e 's/^php-sabredav-//' -e 's/-/_/g')
+%global pear_name   Sabre_VObject
 %global channelname pear.sabredav.org
+%global mainver     1.7.8
+%global reldate     2013-06-17
 
 Name:           php-sabredav-Sabre_VObject
-Version:        1.3.5
-Release:        5%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        An intuitive reader for iCalendar and vCard objects
 
+Group:          Development/Libraries
 License:        BSD
 URL:            http://code.google.com/p/sabredav
-Source0:        http://pear.sabredav.org/get/%{pear_name}-%{version}.tgz
+# https://github.com/fruux/sabre-dav/issues/336
+# Please update PEAR channel
+Source0:        http://sabredav.googlecode.com/files/SabreDAV-%{mainver}.zip
+Source1:        %{name}.xml
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR)
 BuildRequires:  php-channel(%{channelname})
@@ -18,11 +25,10 @@ BuildRequires:  php-channel(%{channelname})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
-Requires:       php-common >= 5
 Requires:       php-mbstring
 Requires:       php-pear(PEAR)
 Requires:       php-channel(%{channelname})
-Requires:       php-pear(%{channelname}/Sabre)
+Requires:       php-pear(%{channelname}/Sabre) >= 1.0.0
 
 Provides:       php-pear(%{pear_name}) = %{version}
 Provides:       php-pear(%{channelname}/%{pear_name}) = %{version}
@@ -31,32 +37,54 @@ Provides:       php-pear(%{channelname}/%{pear_name}) = %{version}
 SabreDAV VObject plugin.
 
 %prep
-%setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+%setup -q -n SabreDAV
+
+sed -e 's/@VERSION@/%{version}/' \
+    -e 's/@RELDATE@/%{reldate}/' \
+    %{SOURCE1} >%{name}.xml
+mv vendor/sabre/vobject/lib/Sabre Sabre
+mv vendor/sabre/vobject/LICENSE .
+mv vendor/sabre/vobject/ChangeLog .
+
+# Check version
+extver=$(sed -n "/VERSION/{s/.* '//;s/'.*$//;p}" Sabre/VObject/Version.php)
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream version is ${extver}, expecting %{version}.
+   exit 1
+fi
+
+# Check files
+touch error.lst
+for fic in $(find Sabre/VObject -type f)
+do
+  grep $fic %{name}.xml || echo $fic >> error.lst
+done
+
+if [ -s error.lst ]; then
+  : Missing in %{name}.xml
+  cat error.lst
+  exit 1
+fi
+
 
 %build
 # Empty build section, most likely nothing required.
 
+
 %install
-cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-%if 0%{?rhel}
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
-%else
-rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
-%endif
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -66,20 +94,16 @@ fi
 
 
 %files
+%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Sabre/VObject
 
 
 %changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Mar 02 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.3.5-4
-- Fix cleanup in rhel6 and f19
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
+* Tue Sep 03 2013 Joseph Marrero <jmarrero at fedoraproject.org> 2.1.0-1
+- update to 2.1.0
+- use our own package.xml created by Remi Collet as upstream doesn't use pear anymore
 * Wed Oct 31 2012 Joseph Marrero <jmarrero at fedoraproject.org> 1.3.5-2
 - specified php version as pointed out by phpci
 * Tue Oct 23 2012 Joseph Marrero <jmarrero at fedoraproject.org> 1.3.5-1