php-sabredav-Sabre_VObject: 2.0.7

2 files changed, 126 insertions, 15 deletions

diff --git a/php-sabredav-Sabre_VObject.spec b/php-sabredav-Sabre_VObject.spec
index 7543f13..a498f9a 100644
--- a/php-sabredav-Sabre_VObject.spec
+++ b/php-sabredav-Sabre_VObject.spec
@@ -1,16 +1,20 @@
 %{!?__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.8.5
 
 Name:           php-sabredav-Sabre_VObject
-Version:        1.3.5
-Release:        2%{?dist}
+Version:        2.0.7
+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
@@ -23,7 +27,7 @@ Requires(postun): %{__pear}
 Requires:       php-mbstring
 Requires:       php-pear(PEAR)
 Requires:       php-channel(%{channelname})
-Requires:       php-pear(%{channelname}/Sabre)
+Requires:       php-pear(%{channelname}/Sabre) >= 1.0.1
 
 Provides:       php-pear(%{pear_name}) = %{version}
 Provides:       php-pear(%{channelname}/%{pear_name}) = %{version}
@@ -32,28 +36,52 @@ 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
+
+cp %{SOURCE1} .
+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
-rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
+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
@@ -65,11 +93,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Sabre/VObject
 
 
 %changelog
+* Tue May  7 2013 Remi Collet <RPMS@FamilleCollet.com> 2.0.7-1
+- update to 2.0.7
+  use our own package.xml as upstream doesn't use pear anymore
+
 * Mon Nov 12 2012 Remi Collet <RPMS@FamilleCollet.com> 1.3.5-2
 - backport for remi repo
 
diff --git a/php-sabredav-Sabre_VObject.xml b/php-sabredav-Sabre_VObject.xml
new file mode 100644
index 0000000..ccea125
--- /dev/null
+++ b/php-sabredav-Sabre_VObject.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0">
+ <name>Sabre_VObject</name>
+ <channel>pear.sabredav.org</channel>
+ <summary>Sabre_VObject is a natural-interface iCalendar and vCard reader</summary>
+ <description>Sabre_VObject is an intuitive reader for iCalendar and vCard objects.
+
+It provides a natural array/object accessor interface to the parsed tree, much like
+simplexml for XML files.</description>
+ <lead>
+  <name>Evert Pot</name>
+  <user>Evert Pot</user>
+  <email>evert@rooftopsolutions.nl</email>
+  <active>true</active>
+ </lead>
+ <date>2012-10-04</date>
+ <time>12:02:40</time>
+ <version>
+  <release>2.0.7</release>
+  <api>2.0.7</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="http://code.google.com/p/sabredav/wiki/License">Modified BSD</license>
+ <notes>
+New release. Read the ChangeLog and announcement for more details
+ </notes>
+ <contents>
+  <dir name="/">
+   <file name="Sabre/VObject/Component/VAlarm.php" role="php" />
+   <file name="Sabre/VObject/Component/VCalendar.php" role="php" />
+   <file name="Sabre/VObject/Component/VEvent.php" role="php" />
+   <file name="Sabre/VObject/Component/VJournal.php" role="php" />
+   <file name="Sabre/VObject/Component/VTodo.php" role="php" />
+   <file name="Sabre/VObject/Property/DateTime.php" role="php" />
+   <file name="Sabre/VObject/Property/MultiDateTime.php" role="php" />
+   <file name="Sabre/VObject/Component.php" role="php" />
+   <file name="Sabre/VObject/DateTimeParser.php" role="php" />
+   <file name="Sabre/VObject/ElementList.php" role="php" />
+   <file name="Sabre/VObject/FreeBusyGenerator.php" role="php" />
+   <file name="Sabre/VObject/Node.php" role="php" />
+   <file name="Sabre/VObject/Parameter.php" role="php" />
+   <file name="Sabre/VObject/ParseException.php" role="php" />
+   <file name="Sabre/VObject/Property.php" role="php" />
+   <file name="Sabre/VObject/Reader.php" role="php" />
+   <file name="Sabre/VObject/RecurrenceIterator.php" role="php" />
+   <file name="Sabre/VObject/Version.php" role="php" />
+   <file name="Sabre/VObject/includes.php" role="php" />
+   <file name="Sabre/VObject/TimeZoneUtil.php" role="php" />
+   <file name="Sabre/VObject/StringUtil.php" role="php" />
+   <file name="Sabre/VObject/Splitter/VCard.php" role="php" />
+   <file name="Sabre/VObject/Splitter/SplitterInterface.php" role="php" />
+   <file name="Sabre/VObject/Splitter/ICalendar.php" role="php" />
+   <file name="Sabre/VObject/Property/Compound.php" role="php" />
+   <file name="Sabre/VObject/Component/VFreeBusy.php" role="php" />
+   <file name="Sabre/VObject/Component/VCard.php" role="php" />
+   <file name="ChangeLog" role="doc" />
+   <file name="LICENSE" role="doc" />
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.3.1</min>
+   </php>
+   <pearinstaller>
+    <min>1.9</min>
+   </pearinstaller>
+   <package>
+    <name>Sabre</name>
+    <channel>pear.sabredav.org</channel>
+    <min>1.0.0</min>
+   </package>
+  </required>
+ </dependencies>
+ <phprelease />
+</package>