From 1ad985c90942ba00ab48c2e8a9f0489af06ab1dc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Nov 2012 11:05:58 +0100 Subject: php-sabredav-Sabre_CardDAV: backport --- Makefile | 4 ++++ php-sabredav-Sabre_CardDAV.spec | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) 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_CardDAV.spec b/php-sabredav-Sabre_CardDAV.spec index 523cb45..c030e52 100644 --- a/php-sabredav-Sabre_CardDAV.spec +++ b/php-sabredav-Sabre_CardDAV.spec @@ -7,10 +7,12 @@ Version: 1.6.5 Release: 2%{?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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear(PEAR) BuildRequires: php-channel(%{channelname}) @@ -48,7 +50,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 +69,16 @@ fi %files +%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{pear_name}.xml %{pear_phpdir}/Sabre/CardDAV %changelog +* Mon Nov 12 2012 Remi Collet 1.6.5-2 +- backport for remi repo + * Wed Oct 31 2012 Joseph Marrero 1.6.5-2 - added required deps pointed out by phpci * Tue Oct 23 2012 Joseph Marrero 1.6.5-1 -- cgit