gunnar: server/php-kolab/Kolab_Filter Kolab_Filter.spec, 1.10, 1.11 Makefile, 1.4, 1.5

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv14317/Kolab_Filter

Modified Files:
	Kolab_Filter.spec Makefile 
Log Message:
Update to Kolab_Filter-0.1.2.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Kolab_Filter.spec	25 Nov 2008 07:13:49 -0000	1.10
+++ Kolab_Filter.spec	5 Dec 2008 17:24:01 -0000	1.11
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
-%define         V_version 0.1.1
-%define         V_release 20081125
+%define         V_version 0.1.2
+%define         V_release 20081205
 
 # Package Information
 Name:	   %{V_package}
@@ -16,10 +16,6 @@
 
 # List of Sources
 Source0:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
-Source1:    package.xml
-
-# List of patches
-Patch0:    kolab-issue3260.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -48,8 +44,6 @@
 
 %prep
 	%setup -n %{V_package}-%{V_version}
-	%patch -p1 -P 0
-	cp %{S:1} .
 
 %build
 
@@ -59,7 +53,7 @@
 
         env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT package.xml
+	    %{l_prefix}/bin/pear -d www_dir="%{l_prefix}/var/kolab/www/freebusy" install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                 \

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	25 Nov 2008 07:13:49 -0000	1.4
+++ Makefile	5 Dec 2008 17:24:01 -0000	1.5
@@ -16,7 +16,6 @@
 endif
 
 SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog kolab-issue3260.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -35,7 +34,7 @@
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .