From a40ff6f0618057dabfbeac6e211f656f728ed6016eb6bfcb3df3254413698640 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Thu, 1 Jan 2009 18:00:27 +0000
Subject: [PATCH] update to 0.2-stable

OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=18
---
 roundcubemail-0.2-beta.tar.bz2   |  3 ---
 roundcubemail-0.2-stable.tar.bz2 |  3 +++
 roundcubemail-httpd.conf         |  5 +++++
 roundcubemail.changes            | 13 +++++++++++++
 roundcubemail.spec               |  6 ++++++
 5 files changed, 27 insertions(+), 3 deletions(-)
 delete mode 100644 roundcubemail-0.2-beta.tar.bz2
 create mode 100644 roundcubemail-0.2-stable.tar.bz2

diff --git a/roundcubemail-0.2-beta.tar.bz2 b/roundcubemail-0.2-beta.tar.bz2
deleted file mode 100644
index 2bfec7c..0000000
--- a/roundcubemail-0.2-beta.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33b6fc907563290e16b3d1a79f53981e2b3719853147fa507de81ad742c70792
-size 1316865
diff --git a/roundcubemail-0.2-stable.tar.bz2 b/roundcubemail-0.2-stable.tar.bz2
new file mode 100644
index 0000000..5e57299
--- /dev/null
+++ b/roundcubemail-0.2-stable.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bca9b4456b425f7f95827fb02eda683903d6ab813b79592e2ab8c58931ba61c8
+size 1350504
diff --git a/roundcubemail-httpd.conf b/roundcubemail-httpd.conf
index fad0b10..9474631 100644
--- a/roundcubemail-httpd.conf
+++ b/roundcubemail-httpd.conf
@@ -31,6 +31,11 @@
   Allow from all
  </Directory>
 
+ <Directory __ROUNDCUBEPATH__/bin>
+  Order allow,deny
+  Deny from all
+ </Directory>
+
  <Directory __ROUNDCUBEPATH__/config>
   Order allow,deny
   Deny from all
diff --git a/roundcubemail.changes b/roundcubemail.changes
index 556853f..de83093 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jan  1 18:40:35 CET 2009 - lars@linux-schulserver.de
+
+- update to 0.2 stable:
+  + many, many bugfixes
+  + improved addressbook and global search
+  + support multiple quota values
+  + added "show_images" option
+  + added message status filter
+  + ...and many more. Please read the CHANGELOG file
+- for updates, please refer to the UPGRADING file
+- added bin directory to not allowed paths
+
 -------------------------------------------------------------------
 Tue Sep 23 13:09:19 CEST 2008 - lrupp@suse.de
 
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 61fc136..1894bfc 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -16,6 +16,12 @@ Version:        0.2b1
 %define         real_version 0.2-beta
 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