From 56f7d0a117ae2485f7ec7c36c48eb596d5f412ae Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limb@fedoraproject.org>
Date: Jan 07 2009 13:40:57 +0000
Subject: New upstream.


---

diff --git a/.cvsignore b/.cvsignore
index c01d318..518ffa9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-roundcubemail-0.2-beta-dep.tar.gz
+roundcubemail-0.2-stable-dep.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 29cb7f7..cb19917 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,21 +1,21 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
 Version:  0.2
-Release:  5.beta%{?dist}
+Release:  6.stable%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
 License: GPLv2
 URL: http://www.roundcube.net
-Source0: roundcubemail-%{version}-beta-dep.tar.gz
+Source0: roundcubemail-%{version}-stable-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
+#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
+#Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -43,11 +43,11 @@ requires the MySQL database or the PostgreSQL database. The user
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.2-beta-dep
+%setup -q -n roundcubemail-0.2-stable-dep
 
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
+#%patch1 -p0
+#%patch2 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -135,6 +135,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Mon Jan 05 2009 Jon Ciesla <limb@jcomserv.net> = 0.2-6.stable
+- New upstream.
+- Dropped two most recent patches, applied upstream.
+
 * Wed Dec 17 2008 Jon Ciesla <limb@jcomserv.net> = 0.2-5.beta
 - Security fix, BZ 476830.
 
diff --git a/sources b/sources
index 73c7f2c..7e16cbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-496f5c5645c9bc77c733622182d2fabe  roundcubemail-0.2-beta-dep.tar.gz
+dac7776b063bf2314f7d7730af2b1b0f  roundcubemail-0.2-stable-dep.tar.gz