gunnar: server/php-kolab/Kolab_Filter kolab-issue3260.patch, NONE, 1.1 package.xml, 1.2, 1.3 ChangeLog, 1.24, 1.25 Kolab_Filter.spec, 1.9, 1.10 Makefile, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
	kolab-issue3260.patch package.xml 
Log Message:
 kolab/issue3260 (kolabfilter does not allow empty sender (and therefore MAILER-DAEMON))

--- NEW FILE: kolab-issue3260.patch ---
diff -urN Kolab_Filter-0.1.0.orig/lib/Horde/Kolab/Filter/Base.php Kolab_Filter-0.1.0/lib/Horde/Kolab/Filter/Base.php
--- Kolab_Filter-0.1.0/lib/Horde/Kolab/Filter/Base.php	2008-10-29 12:02:47.000000000 +0100
+++ Kolab_Filter-0.1.0/lib/Horde/Kolab/Filter/Base.php	2008-11-21 16:58:15.359435000 +0100
@@ -228,8 +228,8 @@
             require_once $values['config'];
         }
 
-        if (empty($values['sender']) || empty($values['recipient'])) {
-            $msg = 'Please provide a value for the sender and the recipient.' 
+        if (empty($values['recipient'])) {
+            $msg = 'Please provide one or more recipients.' 
                 . "\n\n" . $p->getUsage();
             return PEAR::raiseError($msg, OUT_STDOUT | EX_USAGE);
         }


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ChangeLog	8 Nov 2008 11:23:35 -0000	1.24
+++ ChangeLog	25 Nov 2008 07:13:49 -0000	1.25
@@ -1,3 +1,8 @@
+2008-11-25  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: Update to 0.1.1.
+	 kolab/issue3260 (kolabfilter does not allow empty sender (and therefore MAILER-DAEMON))
+
 2008-11-08  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: Update to 0.1.0.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Kolab_Filter.spec	14 Nov 2008 06:27:21 -0000	1.9
+++ Kolab_Filter.spec	25 Nov 2008 07:13:49 -0000	1.10
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
-%define         V_version 0.1.0.20081114
-%define         V_release 20081114
+%define         V_version 0.1.1
+%define         V_release 20081125
 
 # Package Information
 Name:	   %{V_package}
@@ -15,9 +15,11 @@
 Distribution:	OpenPKG
 
 # List of Sources
-# FIXME: Temporary location until I release it for real on pear.horde.org
-Source:    http://files.pardus.de/kolab-sources/%{V_package}-%{V_version}.tgz
-#Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+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}
@@ -46,6 +48,8 @@
 
 %prep
 	%setup -n %{V_package}-%{V_version}
+	%patch -p1 -P 0
+	cp %{S:1} .
 
 %build
 
@@ -55,7 +59,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 -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
+	    %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT package.xml
 	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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	10 Nov 2008 19:27:09 -0000	1.3
+++ Makefile	25 Nov 2008 07:13:49 -0000	1.4
@@ -15,9 +15,8 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-# FIXME: Temporary location until I release it for real on pear.horde.org
-SOURCE_0=http://files.pardus.de/kolab-sources/$(PACKAGE)-$(VERSION).tgz
-#SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+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
@@ -36,7 +35,7 @@
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .