From c82b88df913d0fe961d46030c419dc554bab09c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Nov 2012 11:02:37 +0100 Subject: php-sabredav-Sabre_CalDAV: bacport --- Makefile | 4 ++++ php-sabredav-Sabre_CalDAV.spec | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..13af741 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../../common/Makefile + diff --git a/php-sabredav-Sabre_CalDAV.spec b/php-sabredav-Sabre_CalDAV.spec index 35a9b03..af8e5db 100644 --- a/php-sabredav-Sabre_CalDAV.spec +++ b/php-sabredav-Sabre_CalDAV.spec @@ -7,10 +7,12 @@ Version: 1.6.4 Release: 3%{?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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear(PEAR) BuildRequires: php-channel(%{channelname}) @@ -18,7 +20,6 @@ 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) @@ -48,7 +49,7 @@ cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Clean up unnecessary files -rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* +rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} @@ -67,12 +68,16 @@ fi %files +%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{pear_name}.xml %{pear_phpdir}/Sabre/CalDAV %changelog +* Mon Nov 12 2012 Remi Collet 1.6.4-3 +- backport for remi repo + * Wed Oct 31 2012 Joseph Marrero 1.6.4-3 - Added required deps pointed out by phpci * Tue Oct 23 2012 Joseph Marrero 1.6.4-2 -- cgit