From 97d7ddd010963f0e4b72f31979fccf3e18444ef04243ed4975b96163144248f7 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Tue, 10 Mar 2009 15:17:20 +0000
Subject: [PATCH] update to 0.2.1

OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=19
---
 roundcubemail-0.2-stable.tar.bz2 |  3 ---
 roundcubemail-0.2.1.tar.bz2      |  3 +++
 roundcubemail.changes            |  9 +++++++++
 roundcubemail.spec               | 11 ++---------
 4 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 roundcubemail-0.2-stable.tar.bz2
 create mode 100644 roundcubemail-0.2.1.tar.bz2

diff --git a/roundcubemail-0.2-stable.tar.bz2 b/roundcubemail-0.2-stable.tar.bz2
deleted file mode 100644
index 5e57299..0000000
--- a/roundcubemail-0.2-stable.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bca9b4456b425f7f95827fb02eda683903d6ab813b79592e2ab8c58931ba61c8
-size 1350504
diff --git a/roundcubemail-0.2.1.tar.bz2 b/roundcubemail-0.2.1.tar.bz2
new file mode 100644
index 0000000..891db32
--- /dev/null
+++ b/roundcubemail-0.2.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8a3d69515988ed783fc10c9839b6bade6ba0668c169dbd89274fc5659a28809
+size 1354259
diff --git a/roundcubemail.changes b/roundcubemail.changes
index de83093..b5657b1 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Mar 10 16:15:10 CET 2009 - lars@linux-schulserver.de
+
+- update to 0.2.1:
+  + more than 40 bug fixes
+  + completes some missing translations
+  + added TNEF support to decode proprietary MS Outlook attachments 
+    (winmail.dat)
+
 -------------------------------------------------------------------
 Thu Jan  1 18:40:35 CET 2009 - lars@linux-schulserver.de
 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 1894bfc..082e1b2 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -12,16 +12,9 @@ Summary:        A modern browser-based multilingual IMAP client
 Group:          Productivity/Networking/Email/Clients
 License:        GNU General Public License (GPL)
 Url:            http://www.roundcube.net/
-Version:        0.2b1
-%define         real_version 0.2-beta
+Version:        0.2.1
 Release:        0
 BuildRequires:  apache2-devel pcre-devel
-<<<<<<< ./roundcubemail.spec.mine
-Version:        0.2
-%define real_version 0.2
-Release:        0
-=======
->>>>>>> ./roundcubemail.spec.r17
 Requires:       http_daemon mod_php_any php-session php-mysql php-iconv
 Requires:       php-gettext php-mbstring php-openssl 
 Source0:        %{name}-%{real_version}.tar.bz2
@@ -46,7 +39,7 @@ The user interface is fully skinnable using XHTML and CSS 2.
 
 
 %prep
-%setup -q -n %{name}-%{real_version}
+%setup -q -n %{name}-%{version}
 %patch1 -p0
 
 %build