[roundcubemail] new upstream release 0.7, drop all patches but confpath.patch

[Adam Williamson]

commit 8d5d79d6cd306e69dd63b2f27fe195c5e965c0c8
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Dec 14 17:58:48 2011 -0800

    new upstream release 0.7, drop all patches but confpath.patch

 .gitignore                                 |    1 +
 roundcubemail-0.1.1-mysql.update.sql.patch |   11 ---
 roundcubemail-0.1.1-pear.patch             |   11 ---
 roundcubemail-0.2-CVE-2009-0413.patch      |   24 -------
 roundcubemail-0.2-alpha-confpath.patch     |   18 -----
 roundcubemail-0.2-beta-CVE-2008-5620.patch |   60 ------------------
 roundcubemail-0.2-beta-confpath.patch      |   12 ----
 roundcubemail-0.2-beta-html2text.patch     |   94 ----------------------------
 roundcubemail-0.2-stable-pg-mdb2.patch     |    5 --
 roundcubemail-0.3.1-CVE-2010-0464.patch    |   17 -----
 roundcubemail-0.4.1-pg-mdb2.patch          |   11 ---
 roundcubemail-0.5.1-CVE-2010-0464.patch    |   17 -----
 roundcubemail.spec                         |   27 +++-----
 sources                                    |    2 +-
 14 files changed, 12 insertions(+), 298 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79cd6bf..a6793fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.5.3-dep.tar.gz
 /roundcubemail-0.5.4-dep.tar.gz
 /roundcubemail-0.6-dep.tar.gz
+/roundcubemail-0.7-dep.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index eef525f..79c45ae 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  0.6
+Version:  0.7
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -12,16 +12,8 @@ Source0: roundcubemail-%{version}-dep.tar.gz
 Source1: roundcubemail.conf
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
-#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
-Patch5: roundcubemail-0.5.1-CVE-2010-0464.patch
+# Non-upstremable: Adjusts config path to Fedora policy
 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)
@@ -52,14 +44,7 @@ interface is fully skinnable using XHTML and CSS 2.
 %prep
 %setup -q -n roundcubemail-%{version}-dep
 
-#%patch0 -p0
-#%patch1 -p0
-#%patch2 -p0
-#%patch3 -p0
-#%patch4 -p0
-%patch5 -p0
 %patch6 -p0
-%patch7 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -151,6 +136,14 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Wed Dec 14 2011 Adam Williamson <awilliam at redhat.com> - 0.7-1
+- new upstream release
+- drop all patches except confpath.patch:
+	+ html2text.patch and all CVE fixes were merged upstream
+	+ pg-mdb2.patch no longer necessary as all currently supported
+	  Fedora releases have a php-pear-MDB2-Driver-pgsql package new
+	  enough to work with this option
+
 * Fri Oct 07 2011 Jon Ciesla <limb at jcomserv.net> = 0.6-1
 - New upstream.
 
diff --git a/sources b/sources
index 79af0c1..16b41bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8755dc81337897d1eb96633f5e94aca5  roundcubemail-0.6-dep.tar.gz
+ba22fffd3f5dfac9d689ebd7a28ac652  roundcubemail-0.7-dep.tar.gz