[php-sabredav-Sabre_CalDAV] Update to 1.7.8
Joseph Marrero
jmarrero at fedoraproject.org
Wed Sep 4 00:25:13 UTC 2013
commit 84fa1aff452c3bcf0341e75565388a65ac5cebbc
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date: Tue Sep 3 20:24:32 2013 -0400
Update to 1.7.8
.gitignore | 1 +
php-sabredav-Sabre_CalDAV.spec | 87 ++++++++++++++++++-----------
php-sabredav-Sabre_CalDAV.xml | 121 ++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
4 files changed, 177 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad2227b..d699970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/Sabre_CalDAV-1.6.4.tgz
+/SabreDAV-1.7.8.zip
diff --git a/php-sabredav-Sabre_CalDAV.spec b/php-sabredav-Sabre_CalDAV.spec
index cbcc79c..c9b1430 100644
--- a/php-sabredav-Sabre_CalDAV.spec
+++ b/php-sabredav-Sabre_CalDAV.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_CalDAV
%global channelname pear.sabredav.org
+%global mainver 1.7.8
+%global reldate 2013-06-17
Name: php-sabredav-Sabre_CalDAV
-Version: 1.6.4
-Release: 6%{?dist}
+Version: 1.7.8
+Release: 1%{?dist}
Summary: Provides RFC4791 (CalDAV) 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}
@@ -35,33 +41,52 @@ Provides: php-pear(%{channelname}/%{pear_name}) = %{version}
CalDAV plugin for Sabre, Adds support for CalDAV 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/CalDAV/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/CalDAV -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,23 +96,19 @@ fi
%files
+%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Sabre/CalDAV
%changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Mar 02 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.4-5
-- Fix cleanup in rhel6 and f19
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Oct 31 2012 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.4-3
+* Tue Sep 03 2013 Joseph Marrero <jmarrero at fedoraproject.org> 1.7.8-1
+- update to 1.7.8
+- use our own package.xml provided by Remi Collet as upstream doesn't use pear anymore
+* Wed Oct 31 2012 Joseph Marrero <jmarrero at fedoraproject.org> 1.6.4-3
- Added required deps pointed out by phpci
-* Tue Oct 23 2012 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.4-2
+* Tue Oct 23 2012 Joseph Marrero <jmarrero at fedoraproject.org> 1.6.4-2
- remove uncesary changes of directory
- change define to global
- fix documentation directory
diff --git a/php-sabredav-Sabre_CalDAV.xml b/php-sabredav-Sabre_CalDAV.xml
new file mode 100644
index 0000000..bd0c6aa
--- /dev/null
+++ b/php-sabredav-Sabre_CalDAV.xml
@@ -0,0 +1,121 @@
+<?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_CalDAV</name>
+ <channel>pear.sabredav.org</channel>
+ <summary>Sabre_CalDAV provides CalDAV extensions to SabreDAV</summary>
+ <description>Sabre_CalDAV provides RFC4791 (CalDAV) support to Sabre_DAV.
+
+Feature list:
+* Multi-user Calendar Server
+* Support for Apple iCal, Evolution, Sunbird, Lightning</description>
+ <lead>
+ <name>Evert Pot</name>
+ <user>Evert Pot</user>
+ <email>evert at rooftopsolutions.nl</email>
+ <active>true</active>
+ </lead>
+ <date>@RELDATE@</date>
+ <time>17:13:34</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/CalDAV/includes.php" role="php" />
+ <file name="Sabre/CalDAV/Backend/PDO.php" role="php" />
+ <file name="Sabre/CalDAV/Principal/Collection.php" role="php" />
+ <file name="Sabre/CalDAV/Principal/ProxyRead.php" role="php" />
+ <file name="Sabre/CalDAV/Principal/ProxyWrite.php" role="php" />
+ <file name="Sabre/CalDAV/Principal/User.php" role="php" />
+ <file name="Sabre/CalDAV/Property/SupportedCalendarComponentSet.php" role="php" />
+ <file name="Sabre/CalDAV/Property/SupportedCalendarData.php" role="php" />
+ <file name="Sabre/CalDAV/Property/SupportedCollationSet.php" role="php" />
+ <file name="Sabre/CalDAV/Schedule/IMip.php" role="php" />
+ <file name="Sabre/CalDAV/Schedule/IOutbox.php" role="php" />
+ <file name="Sabre/CalDAV/Schedule/Outbox.php" role="php" />
+ <file name="Sabre/CalDAV/Calendar.php" role="php" />
+ <file name="Sabre/CalDAV/CalendarObject.php" role="php" />
+ <file name="Sabre/CalDAV/CalendarQueryParser.php" role="php" />
+ <file name="Sabre/CalDAV/CalendarQueryValidator.php" role="php" />
+ <file name="Sabre/CalDAV/CalendarRootNode.php" role="php" />
+ <file name="Sabre/CalDAV/ICSExportPlugin.php" role="php" />
+ <file name="Sabre/CalDAV/ICalendar.php" role="php" />
+ <file name="Sabre/CalDAV/ICalendarObject.php" role="php" />
+ <file name="Sabre/CalDAV/Plugin.php" role="php" />
+ <file name="Sabre/CalDAV/UserCalendars.php" role="php" />
+ <file name="Sabre/CalDAV/Version.php" role="php" />
+ <file name="examples/sql/mysql.calendars.sql" role="doc" />
+ <file name="examples/sql/pgsql.calendars.sql" role="doc" />
+ <file name="examples/sql/sqlite.calendars.sql" role="doc" />
+ <file name="examples/calendarserver.php" role="doc" />
+ <file name="ChangeLog" role="doc" />
+ <file name="LICENSE" role="doc" />
+ <file name="Sabre/CalDAV/SharingPlugin.php" role="doc" />
+ <file name="Sabre/CalDAV/SharedCalendar.php" role="doc" />
+ <file name="Sabre/CalDAV/ShareableCalendar.php" role="doc" />
+ <file name="Sabre/CalDAV/Property/ScheduleCalendarTransp.php" role="doc" />
+ <file name="Sabre/CalDAV/Property/Invite.php" role="doc" />
+ <file name="Sabre/CalDAV/Property/AllowedSharingModes.php" role="doc" />
+ <file name="Sabre/CalDAV/Notifications/Notification/SystemStatus.php" role="doc" />
+ <file name="Sabre/CalDAV/Notifications/Notification/InviteReply.php" role="doc" />
+ <file name="Sabre/CalDAV/Notifications/Notification/Invite.php" role="doc" />
+ <file name="Sabre/CalDAV/Notifications/Node.php" role="doc" />
+ <file name="Sabre/CalDAV/Notifications/INotificationType.php" role="doc" />
+ <file name="Sabre/CalDAV/Notifications/INode.php" role="doc" />
+ <file name="Sabre/CalDAV/Notifications/ICollection.php" role="doc" />
+ <file name="Sabre/CalDAV/Notifications/Collection.php" role="doc" />
+ <file name="Sabre/CalDAV/ISharedCalendar.php" role="doc" />
+ <file name="Sabre/CalDAV/IShareableCalendar.php" role="doc" />
+ <file name="Sabre/CalDAV/Exception/InvalidComponentType.php" role="doc" />
+ <file name="Sabre/CalDAV/Backend/SharingSupport.php" role="doc" />
+ <file name="Sabre/CalDAV/Backend/NotificationSupport.php" role="doc" />
+ <file name="Sabre/CalDAV/Backend/BackendInterface.php" role="doc" />
+ <file name="Sabre/CalDAV/Backend/Abstract.php" 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 0bc0f65..ab132b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06132ee55d25fb5e41735000c501467b Sabre_CalDAV-1.6.4.tgz
+06c330ffe79d8cfbcb3fc44d6ac35cd8 SabreDAV-1.7.8.zip
More information about the scm-commits
mailing list