[roundcubemail] 0.4.2.

[Jon Ciesla]

commit 816aad557b7253d6ab9c823a4667fb987826574b
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Jan 3 09:08:43 2011 -0600

    0.4.2.

 .gitignore                         |    1 +
 roundcubemail-0.4.1-confpath.patch |   12 ++++++++++++
 roundcubemail-0.4.1-pg-mdb2.patch  |   11 +++++++++++
 roundcubemail.spec                 |   24 +++++++++++++++++-------
 sources                            |    2 +-
 5 files changed, 42 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de5584f..44d0474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 roundcubemail-0.3.1-dep.tar.gz
+/roundcubemail-0.4.2-dep.tar.gz
diff --git a/roundcubemail-0.4.1-confpath.patch b/roundcubemail-0.4.1-confpath.patch
new file mode 100644
index 0000000..7311f96
--- /dev/null
+++ b/roundcubemail-0.4.1-confpath.patch
@@ -0,0 +1,12 @@
+--- program/include/iniset.php~	2010-09-29 05:04:09.000000000 -0500
++++ program/include/iniset.php	2010-10-04 08:29:02.687967293 -0500
+@@ -46,7 +46,8 @@
+ }
+ 
+ if (!defined('RCMAIL_CONFIG_DIR')) {
+-    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
++    #define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
++    define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+ }
+ 
+ // make sure path_separator is defined
diff --git a/roundcubemail-0.4.1-pg-mdb2.patch b/roundcubemail-0.4.1-pg-mdb2.patch
new file mode 100644
index 0000000..5d54ada
--- /dev/null
+++ b/roundcubemail-0.4.1-pg-mdb2.patch
@@ -0,0 +1,11 @@
+--- program/include/rcube_mdb2.php~	2010-09-26 06:17:03.000000000 -0500
++++ program/include/rcube_mdb2.php	2010-10-04 08:32:58.509966177 -0500
+@@ -87,7 +87,7 @@
+             'portability'      => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL);
+ 
+         if ($this->db_provider == 'pgsql') {
+-            $db_options['disable_smart_seqname'] = true;
++            #$db_options['disable_smart_seqname'] = true;
+             $db_options['seqname_format'] = '%s';
+         }
+ 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 994df0c..a2a9087 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,8 +1,8 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.3.1
-Release:  2%{?dist}
+Version:  0.4.2
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -12,14 +12,16 @@ Source0: roundcubemail-%{version}-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
-Patch0: roundcubemail-0.2-beta-confpath.patch
+#Patch0: roundcubemail-0.2-beta-confpath.patch
 # From upstream, not in a release yet, BZ 476223.
 #Patch1: roundcubemail-0.2-beta-html2text.patch
 # From upstream, not in a release yet, BZ 476830.
 #Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
 #Patch3: roundcubemail-0.2-CVE-2009-0413.patch
-Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
+#Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
 Patch5: roundcubemail-0.3.1-CVE-2010-0464.patch
+Patch6: roundcubemail-0.4.1-confpath.patch
+Patch7: roundcubemail-0.4.1-pg-mdb2.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -31,7 +33,7 @@ Requires: php-pear-Net-Socket
 Requires: php, httpd
 Requires: php-pear-Mail-mimeDecode
 Requires: php-mcrypt
-Requires: php-pear-MDB2
+Requires: php-pear-MDB2 >= 2.5.0
 Requires: php-pear-MDB2-Driver-mysql
 Requires: php-pecl-Fileinfo
 Requires: php-xml
@@ -49,12 +51,14 @@ interface is fully skinnable using XHTML and CSS 2.
 %prep
 %setup -q -n roundcubemail-%{version}-dep
 
-%patch0 -p0
+#%patch0 -p0
 #%patch1 -p0
 #%patch2 -p0
 #%patch3 -p0
-%patch4 -p0
+#%patch4 -p0
 %patch5 -p0
+%patch6 -p0
+%patch7 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -146,6 +150,12 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Mon Oct 18 2010 Jon Ciesla <limb at jcomserv.net> = 0.4.2-1
+- New upstream.
+
+* Mon Oct 04 2010 Jon Ciesla <limb at jcomserv.net> = 0.4.1-1
+- New upstream.
+
 * Mon Feb 01 2010 Jon Ciesla <limb at jcomserv.net> = 0.3.1-2
 - Patch to fix CVE-2010-0464, BZ 560143.
 
diff --git a/sources b/sources
index 6effb20..363ca1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad8e3ba04b53e488547f643076722aa5  roundcubemail-0.3.1-dep.tar.gz
+451fc2229682d410f774365b3953dfad  roundcubemail-0.4.2-dep.tar.gz