packages: horde-ingo/horde-ingo.spec, horde-ingo/ingo-maildir-prefix.patch ...

[baggins]

Author: baggins                      Date: Sun May  9 23:34:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- allow maildir folders to NOT begin with dot

---- Files affected:
packages/horde-ingo:
   horde-ingo.spec (1.50 -> 1.51) , ingo-maildir-prefix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/horde-ingo/horde-ingo.spec
diff -u packages/horde-ingo/horde-ingo.spec:1.50 packages/horde-ingo/horde-ingo.spec:1.51
--- packages/horde-ingo/horde-ingo.spec:1.50	Mon Apr 19 11:34:29 2010
+++ packages/horde-ingo/horde-ingo.spec	Mon May 10 01:34:16 2010
@@ -6,13 +6,14 @@
 Summary(pl.UTF-8):	Ingo - zarządca reguł filtrowania poczty elektronicznej
 Name:		horde-%{hordeapp}
 Version:	1.2.3
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/ingo/%{hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	f17547019c9db2e47b393724be67197c
 Source1:	%{hordeapp}.conf
 Patch0:		%{hordeapp}-path.patch
+Patch1:		%{hordeapp}-maildir-prefix.patch
 URL:		http://www.horde.org/ingo/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -63,6 +64,7 @@
 %prep
 %setup -q -n %{hordeapp}-h3-%{version}
 %patch0 -p1
+%patch1 -p1
 
 rm */.htaccess
 for i in config/*.dist; do
@@ -133,6 +135,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2010/05/09 23:34:16  baggins
+- rel 2
+- allow maildir folders to NOT begin with dot
+
 Revision 1.50  2010/04/19 09:34:29  baggins
 - 1.2.3
 

================================================================
Index: packages/horde-ingo/ingo-maildir-prefix.patch
diff -u /dev/null packages/horde-ingo/ingo-maildir-prefix.patch:1.1
--- /dev/null	Mon May 10 01:34:21 2010
+++ packages/horde-ingo/ingo-maildir-prefix.patch	Mon May 10 01:34:16 2010
@@ -0,0 +1,27 @@
+--- ingo-h3-1.2.3/lib/Script/procmail.php~	2010-05-10 01:06:45.552586096 +0200
++++ ingo-h3-1.2.3/lib/Script/procmail.php	2010-05-10 01:31:29.703394736 +0200
+@@ -758,7 +758,12 @@
+             if (substr($folder, 0, 6) == 'INBOX.') {
+                 $folder = substr($folder, 6);
+             }
+-            return '"$DEFAULT/.' . escapeshellcmd($folder) . '/"';
++	    if (isset($this->_params['no_dot_folder']) &&
++			$this->_params['no_dot_folder']) {
++		return '"$DEFAULT/' . escapeshellcmd($folder) . '/"';
++            } else {    
++	        return '"$DEFAULT/.' . escapeshellcmd($folder) . '/"';
++	    }
+         } else {
+             if (empty($folder) || ($folder == 'INBOX')) {
+                 return '$DEFAULT';
+--- ingo-h3-1.2.3/config/backends.php~	2008-12-15 03:33:07.000000000 +0100
++++ ingo-h3-1.2.3/config/backends.php	2010-05-10 01:32:45.118392319 +0200
+@@ -169,6 +169,8 @@
+     'scriptparams' => array(
+         // What path style does the IMAP server use ['mbox'|'maildir']?
+         'path_style' => 'mbox',
++        // Do not prepend folder names with dot in procmailrc rules
++        // 'no_dot_folder' => true,
+         // An array of variables to append to every generated script.
+         // Use if you need to set up specific environment variables.
+         'variables' => array(
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde-ingo/horde-ingo.spec?r1=1.50&r2=1.51&f=u