[php-sabredav-Sabre_CardDAV] Update to 1.7.8

Joseph Marrero jmarrero at fedoraproject.org
Wed Sep 4 00:15:15 UTC 2013 

commit ba63c0cea2f47f713db7a5aaca5770403678046b
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Tue Sep 3 20:14:10 2013 -0400

    Update to 1.7.8

 .gitignore                      |    1 +
 php-sabredav-Sabre_CardDAV.spec |   84 ++++++++++++++++++++++-------------
 php-sabredav-Sabre_CardDAV.xml  |   92 +++++++++++++++++++++++++++++++++++++++
 sources                         |    2 +-
 4 files changed, 147 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ea180c..2d6d450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /Sabre_CardDAV-1.6.5.tgz
+/SabreDAV-1.7.8.zip
diff --git a/php-sabredav-Sabre_CardDAV.spec b/php-sabredav-Sabre_CardDAV.spec
index 5210102..3361eb1 100644
--- a/php-sabredav-Sabre_CardDAV.spec
+++ b/php-sabredav-Sabre_CardDAV.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_CardDAV
 %global channelname pear.sabredav.org
+%global mainver     1.7.8
+%global reldate     2013-06-17
 
 Name:           php-sabredav-Sabre_CardDAV
-Version:        1.6.5
-Release:        5%{?dist}
+Version:        1.7.8
+Release:        1%{?dist}
 Summary:        Provides CardDAV support to Sabre_DAV
 
+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,15 +25,14 @@ BuildRequires:  php-channel(%{channelname})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
-Requires:       php-common >= 5.1
 Requires:       php-pdo
 Requires:       php-xml
 Requires:       php-pear(PEAR)
 Requires:       php-channel(%{channelname})
-Requires:       php-pear(%{channelname}/Sabre)
-Requires:       php-pear(%{channelname}/Sabre_DAV)
-Requires:       php-pear(%{channelname}/Sabre_DAVACL)
-Requires:       php-pear(%{channelname}/Sabre_VObject)
+Requires:       php-pear(%{channelname}/Sabre)         >= 1.0.0
+Requires:       php-pear(%{channelname}/Sabre_DAV)     >= 1.7.8
+Requires:       php-pear(%{channelname}/Sabre_DAVACL)  >= 1.7.8
+Requires:       php-pear(%{channelname}/Sabre_VObject) >= 2.1.0
 
 Provides:       php-pear(%{pear_name}) = %{version}
 Provides:       php-pear(%{channelname}/%{pear_name}) = %{version}
@@ -34,34 +40,54 @@ Provides:       php-pear(%{channelname}/%{pear_name}) = %{version}
 %description
 CardDAV plugin for Sabre, Adds support for CardDAV in Sabre_DAV.
 
+
 %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 lib/Sabre Sabre
+
+# Check version
+extver=$(sed -n "/VERSION/{s/.* '//;s/'.*$//;p}" Sabre/CardDAV/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/CardDAV -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
@@ -71,20 +97,16 @@ fi
 
 
 %files
+%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Sabre/CardDAV
 
 
 %changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Mar 02 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.5-4
-- Fix cleanup in rhel6 and f19
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
+* Tue Sep 03 2013 Joseph Marrero <jmarrero at fedoraproject.org> 1.7.8-1
+- update to 1.7.8
+- 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.6.5-2
 - added required deps pointed out by phpci
 * Tue Oct 23 2012 Joseph Marrero <jmarrero at fedoraproject.org> 1.6.5-1
diff --git a/php-sabredav-Sabre_CardDAV.xml b/php-sabredav-Sabre_CardDAV.xml
new file mode 100644
index 0000000..6b0eaa7
--- /dev/null
+++ b/php-sabredav-Sabre_CardDAV.xml
@@ -0,0 +1,92 @@
+<?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_CardDAV</name>
+ <channel>pear.sabredav.org</channel>
+ <summary>Sabre_CardDAV provides CardDAV extensions to SabreDAV</summary>
+ <description>Sabre_CardDAV provides CardDAV support to Sabre_DAV.
+
+Feature list:
+* Multi-user addressbook server
+* ACL support
+* Support for OS/X, iOS, Evolution and probably more
+* Hook-ins for creating a global \&apos;directory\&apos;.</description>
+ <lead>
+  <name>Evert Pot</name>
+  <user>Evert Pot</user>
+  <email>evert at rooftopsolutions.nl</email>
+  <active>true</active>
+ </lead>
+ <date>@RELDATE@</date>
+ <time>12:02:39</time>
+ <version>
+  <release>@VERSION@</release>
+  <api>@VERSION@</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/CardDAV/Backend/PDO.php" role="php" />
+   <file name="Sabre/CardDAV/Backend/Abstract.php" role="php" />
+   <file name="Sabre/CardDAV/Property/SupportedAddressData.php" role="php" />
+   <file name="Sabre/CardDAV/AddressBook.php" role="php" />
+   <file name="Sabre/CardDAV/AddressBookQueryParser.php" role="php" />
+   <file name="Sabre/CardDAV/AddressBookRoot.php" role="php" />
+   <file name="Sabre/CardDAV/Card.php" role="php" />
+   <file name="Sabre/CardDAV/IAddressBook.php" role="php" />
+   <file name="Sabre/CardDAV/ICard.php" role="php" />
+   <file name="Sabre/CardDAV/IDirectory.php" role="php" />
+   <file name="Sabre/CardDAV/Plugin.php" role="php" />
+   <file name="Sabre/CardDAV/UserAddressBooks.php" role="php" />
+   <file name="Sabre/CardDAV/Version.php" role="php" />
+   <file name="Sabre/CardDAV/includes.php" role="php" />
+   <file name="examples/sql/sqlite.addressbooks.sql" role="doc" />
+   <file name="examples/addressbookserver.php" role="doc" />
+   <file name="Sabre/CardDAV/VCFExportPlugin.php" role="doc" />
+   <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>
+   <package>
+    <name>Sabre_HTTP</name>
+    <channel>pear.sabredav.org</channel>
+    <min>1.6.0</min>
+   </package>
+   <package>
+    <name>Sabre_DAV</name>
+    <channel>pear.sabredav.org</channel>
+    <min>1.6.0</min>
+   </package>
+   <package>
+    <name>Sabre_DAVACL</name>
+    <channel>pear.sabredav.org</channel>
+    <min>1.6.0</min>
+   </package>
+   <package>
+    <name>Sabre_VObject</name>
+    <channel>pear.sabredav.org</channel>
+    <min>1.3.0</min>
+   </package>
+  </required>
+ </dependencies>
+ <phprelease />
+</package>
diff --git a/sources b/sources
index 52fcabc..ab132b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8207fe681bfe0da45fc0c1a926a071b  Sabre_CardDAV-1.6.5.tgz
+06c330ffe79d8cfbcb3fc44d6ac35cd8  SabreDAV-1.7.8.zip

More information about the scm-commits mailing list