Author: baggins Date: Thu Oct 13 09:33:39 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.2.6
- allow procmail folders to be crated under $MAILDIR instead of $DEAFULT
---- Files affected:
packages/horde-ingo:
horde-ingo.spec (1.54 -> 1.55) , ingo-folders-in-maildir.patch (NONE -> 1.1)
(NEW)
---- Diffs:
================================================================
Index: packages/horde-ingo/horde-ingo.spec
diff -u packages/horde-ingo/horde-ingo.spec:1.54
packages/horde-ingo/horde-ingo.spec:1.55
--- packages/horde-ingo/horde-ingo.spec:1.54 Thu Sep 30 21:59:23 2010
+++ packages/horde-ingo/horde-ingo.spec Thu Oct 13 11:33:34 2011
@@ -5,15 +5,16 @@
Summary: Ingo - an email filter rules manager
Summary(pl.UTF-8): Ingo - zarządca reguł filtrowania poczty elektronicznej
Name: horde-%{hordeapp}
-Version: 1.2.5
+Version: 1.2.6
Release: 1
License: GPL v2
Group: Applications/WWW
Source0: ftp://ftp.horde.org/pub/ingo/%{hordeapp}-h3-%{version}.tar.gz
-# Source0-md5: a394a02f0a3e3cf4cc57fd6c19712f29
+# Source0-md5: d8549db0b8ceeb08dd16e0f99a275e05
Source1: %{hordeapp}.conf
Patch0: %{hordeapp}-path.patch
Patch1: %{hordeapp}-maildir-prefix.patch
+Patch2: %{hordeapp}-folders-in-maildir.patch
URL: http://www.horde.org/ingo/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
@@ -65,6 +66,7 @@
%setup -q -n %{hordeapp}-h3-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
rm */.htaccess
for i in config/*.dist; do
@@ -135,6 +137,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.55 2011/10/13 09:33:34 baggins
+- 1.2.6
+- allow procmail folders to be crated under $MAILDIR instead of $DEAFULT
+
Revision 1.54 2010/09/30 19:59:23 glen
- autoup to 1.2.5
================================================================
Index: packages/horde-ingo/ingo-folders-in-maildir.patch
diff -u /dev/null packages/horde-ingo/ingo-folders-in-maildir.patch:1.1
--- /dev/null Thu Oct 13 11:33:40 2011
+++ packages/horde-ingo/ingo-folders-in-maildir.patch Thu Oct 13 11:33:34 2011
@@ -0,0 +1,36 @@
+--- ingo-h3-1.2.5/lib/Script/procmail.php~ 2010-09-30 22:00:31.000000000
+0200
++++ ingo-h3-1.2.5/lib/Script/procmail.php 2011-10-13 11:12:19.139091632
+0200
+@@ -758,9 +758,19 @@
+ }
+ if (isset($this->_params['no_dot_folder']) &&
+ $this->_params['no_dot_folder']) {
+- return '"$DEFAULT/' . escapeshellcmd($folder) . '/"';
++ if (isset($this->_params['folders_in_maildir']) &&
++ $this->_params['folders_in_maildir']) {
++ return '"$MAILDIR/' . escapeshellcmd($folder) . '/"';
++ } else {
++ return '"$DEFAULT/' . escapeshellcmd($folder) . '/"';
++ }
+ } else {
+- return '"$DEFAULT/.' . escapeshellcmd($folder) . '/"';
++ if (isset($this->_params['folders_in_maildir']) &&
++ $this->_params['folders_in_maildir']) {
++ return '"$MAILDIR/.' . escapeshellcmd($folder) . '/"';
++ } else {
++ return '"$DEFAULT/.' . escapeshellcmd($folder) . '/"';
++ }
+ }
+ } else {
+ if (empty($folder) || ($folder == 'INBOX')) {
+--- ingo-h3-1.2.5/config/backends.php.dist~ 2008-12-15 03:33:07.000000000
+0100
++++ ingo-h3-1.2.5/config/backends.php.dist 2010-05-10 01:32:45.118392319
+0200
+@@ -171,6 +171,9 @@
+ 'path_style' => 'mbox',
+ // Do not prepend folder names with dot in procmailrc rules
+ // 'no_dot_folder' => true,
++ // Use $MAILDIR instead of $DEFAULT as a place for folders
++ // in procmailrc rules ($MAILDIR/folder, not $DEFAULT/folder)
++ // 'folders_in_maildir' => 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.54&r2=1.55&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
