[php-sabredav-Sabre_DAVACL] Update to 1.7.8
Joseph Marrero
jmarrero at fedoraproject.org
Wed Sep 4 00:01:34 UTC 2013
commit 09bce15461d3f3d2615e9eab657660acb80352d4
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date: Tue Sep 3 20:00:29 2013 -0400
Update to 1.7.8
php-sabredav-Sabre_DAVACL.spec | 79 +++++++++++++++++++++++++---------------
php-sabredav-Sabre_DAVACL.xml | 78 +++++++++++++++++++++++++++++++++++++++
2 files changed, 128 insertions(+), 29 deletions(-)
---
diff --git a/php-sabredav-Sabre_DAVACL.spec b/php-sabredav-Sabre_DAVACL.spec
index 0d093e2..5017c32 100644
--- a/php-sabredav-Sabre_DAVACL.spec
+++ b/php-sabredav-Sabre_DAVACL.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_DAVACL
%global channelname pear.sabredav.org
+%global mainver 1.7.8
+%global reldate 2013-06-17
Name: php-sabredav-Sabre_DAVACL
-Version: 1.6.0
-Release: 6%{?dist}
+Version: 1.7.8
+Release: 1%{?dist}
Summary: RFC3744 implementation for SabreDAV
+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,13 +25,12 @@ 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) >= 1.0.0
+Requires: php-pear(%{channelname}/Sabre_DAV) >= 1.7.8
Provides: php-pear(%{pear_name}) = %{version}
Provides: php-pear(%{channelname}/%{pear_name}) = %{version}
@@ -32,10 +38,34 @@ Provides: php-pear(%{channelname}/%{pear_name}) = %{version}
%description
DAVACL plugin for SabreDAV.
+
%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/DAVACL/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/DAVACL -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
@@ -43,24 +73,19 @@ mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
%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
@@ -70,20 +95,16 @@ fi
%files
+%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Sabre/DAVACL
%changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Mar 02 2013 Joseph Marrero <jmarrero at fedoraproject.org> - 1.6.0-5
-- Fix cleanup in rhel6 and f19
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-4
-- 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 Uptream version
+- Add own pear configuration provided by Remi Collet from RH
* Wed Oct 31 2012 Joseph Marrero <jmarrero at fedoraproject.org> 1.6.0-3
- added required dep pointed out by phpci
* Tue Oct 23 2012 Joseph Marrero <jmarrero at fedoraproject.org> 1.6.0-2
diff --git a/php-sabredav-Sabre_DAVACL.xml b/php-sabredav-Sabre_DAVACL.xml
new file mode 100644
index 0000000..e1a4812
--- /dev/null
+++ b/php-sabredav-Sabre_DAVACL.xml
@@ -0,0 +1,78 @@
+<?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_DAVACL</name>
+ <channel>pear.sabredav.org</channel>
+ <summary>Sabre_DAVACL provides rfc3744 support.</summary>
+ <description>Sabre_DAVACL is the RFC3744 implementation for SabreDAV. It provides principals
+(users and groups) and access control.</description>
+ <lead>
+ <name>Evert Pot</name>
+ <user>Evert Pot</user>
+ <email>evert at rooftopsolutions.nl</email>
+ <active>true</active>
+ </lead>
+ <date>@RELDATE@</date>
+ <time>20:56:05</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/DAVACL/Exception/AceConflict.php" role="php" />
+ <file name="Sabre/DAVACL/Exception/NeedPrivileges.php" role="php" />
+ <file name="Sabre/DAVACL/Exception/NoAbstract.php" role="php" />
+ <file name="Sabre/DAVACL/Exception/NotRecognizedPrincipal.php" role="php" />
+ <file name="Sabre/DAVACL/Exception/NotSupportedPrivilege.php" role="php" />
+ <file name="Sabre/DAVACL/PrincipalBackend/PDO.php" role="php" />
+ <file name="Sabre/DAVACL/Property/Acl.php" role="php" />
+ <file name="Sabre/DAVACL/Property/AclRestrictions.php" role="php" />
+ <file name="Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php" role="php" />
+ <file name="Sabre/DAVACL/Property/Principal.php" role="php" />
+ <file name="Sabre/DAVACL/Property/SupportedPrivilegeSet.php" role="php" />
+ <file name="Sabre/DAVACL/AbstractPrincipalCollection.php" role="php" />
+ <file name="Sabre/DAVACL/IACL.php" role="php" />
+ <file name="Sabre/DAVACL/IPrincipal.php" role="php" />
+ <file name="Sabre/DAVACL/Plugin.php" role="php" />
+ <file name="Sabre/DAVACL/Principal.php" role="php" />
+ <file name="Sabre/DAVACL/PrincipalCollection.php" role="php" />
+ <file name="Sabre/DAVACL/includes.php" role="php" />
+ <file name="Sabre/DAVACL/Version.php" role="php" />
+ <file name="Sabre/DAVACL/IPrincipalBackend.php" role="php" />
+ <file name="examples/sql/mysql.principals.sql" role="doc" />
+ <file name="examples/sql/pgsql.principals.sql" role="doc" />
+ <file name="examples/sql/sqlite.principals.sql" 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_DAV</name>
+ <channel>pear.sabredav.org</channel>
+ <min>1.6.0</min>
+ </package>
+ </required>
+ </dependencies>
+ <phprelease />
+</package>
More information about the scm-commits
mailing list