From 759c35b0ac7218f62b3aa11bd3b4a269bd95a7d1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 16 Nov 2012 15:46:36 +0100
Subject: roundcubemail 0.8.4

---
 roundcubemail-0.8.2-mdb2.patch | 34 ----------------------------------
 roundcubemail.spec             | 12 +++++-------
 2 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 roundcubemail-0.8.2-mdb2.patch

diff --git a/roundcubemail-0.8.2-mdb2.patch b/roundcubemail-0.8.2-mdb2.patch
deleted file mode 100644
index 51f823c..0000000
--- a/roundcubemail-0.8.2-mdb2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 96f8436d77af05cf3c2d4f87970868221ddc6891 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Mon, 29 Oct 2012 09:22:33 +0100
-Subject: [PATCH] fix call to MDB2::isError for MDB2 2.5.0b4
-
----
- program/include/rcube_mdb2.php |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php
-index 3d8891d..876ee02 100644
---- a/program/include/rcube_mdb2.php
-+++ b/program/include/rcube_mdb2.php
-@@ -288,7 +288,7 @@ private function _query($query, $offset, $numrows, $params)
-         else {
-             $params = (array)$params;
-             $q = $this->db_handle->prepare($query, null, $mode=='w' ? MDB2_PREPARE_MANIP : null);
--            if ($this->db_handle->isError($q)) {
-+            if (MDB2::isError($q)) {
-                 $this->db_error = true;
-                 $this->db_error_msg = $q->userinfo;
- 
-@@ -369,7 +369,7 @@ function insert_id($table = '')
- 
-         $id = $this->db_handle->lastInsertID($table);
- 
--        return $this->db_handle->isError($id) ? null : $id;
-+        return MDB2::isError($id) ? null : $id;
-     }
- 
- 
--- 
-1.7.10
-
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 8ea84db..49059c4 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,8 +1,8 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.8.2
-Release:  3%{?dist}
+Version:  0.8.4
+Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -12,12 +12,9 @@ Source0: http://downloads.sourceforge.net/roundcubemail/roundcubemail-%{version}
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
-# https://github.com/roundcube/roundcubemail/pull/40
-Patch1: %{name}-0.8.2-mdb2.patch
 # Non-upstremable: Adjusts config path to Fedora policy
 Patch6: roundcubemail-0.4.1-confpath.patch
 Patch7: roundcubemail-0.8.1-strict.patch
-#Patch8: roundcubemail-0.7.3-xss-sig.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -48,10 +45,8 @@ interface is fully skinnable using XHTML and CSS 2.
 %prep
 %setup -q -n roundcubemail-%{version}-dep
 
-%patch1 -p1
 %patch6 -p0
 %patch7 -p0
-#%patch8 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -143,6 +138,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Fri Nov 16 2012 Remi Collet <remi@fedoraproject.org> - 0.8.4-1
+- new upstream release 0.8.4
+
 * Mon Oct 29 2012 Remi Collet <remi@fedoraproject.org> - 0.8.2-3
 - fix configuration for httpd 2.4 (#871123)
 
-- 
cgit