Accepting request 224325 from server:php:applications

(forwarded request 224324 from wrosenauer)

OBS-URL: https://build.opensuse.org/request/show/224325
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/roundcubemail?expand=0&rev=18

roundcubemail-httpd.conf

@@ -26,7 +26,7 @@ AddType text/x-component .htc
     Allow from all
   </IfModule>
 
-  Options -Indexes FollowSymLinks
+  Options -Indexes +FollowSymLinks
 
   <IfModule mod_php5.c>
     php_flag        display_errors  Off

roundcubemail.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Feb 24 14:02:07 UTC 2014 - aj@ajaissle.de
+
+- Dropped SQL_dir.patch, it's way easier to maintain to just create
+  a symlink.
+
+-------------------------------------------------------------------
+Fri Jan 10 17:54:21 UTC 2014 - aj@ajaissle.de
+
+- Fixed typo in apache2 config file
+
+-------------------------------------------------------------------
+Fri Jan 10 15:58:15 UTC 2014 - aj@ajaissle.de
+
+- Renamed Patch0 (was: roundcubemail-config-dir.patch, now is:
+  roundcubemail-0.9.1_config-dir.patch)
+- PATCH-FIX-OPENSUSE roundcubemail-0.9.5_SQL_dir.pacth -- SQL files
+  are located in _docdir
+
 -------------------------------------------------------------------
 Fri Nov 22 15:46:06 UTC 2013 - aj@ajaissle.de
 

roundcubemail.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package roundcubemail
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,8 +29,8 @@ Source1:        %{name}-rpmlintrc
 Source2:        %{name}-httpd.conf
 Source4:        README.openSUSE
 Source5:        %{name}.logrotate
-# PATCH-FIX-OPENSUSE use the general config directory /etc
+# PATCH-FIX-OPENSUSE roundcubemail-0.9.1_config-dir.patch -- use the general config directory /etc
-Patch0:         %{name}-config-dir.patch
+Patch0:         %{name}-0.9.1_config-dir.patch
 
 BuildArch:      noarch
 BuildRequires:  apache2-devel
@@ -154,6 +154,9 @@ for i in CHANGELOG UPGRADING LICENSE README.md README.openSUSE SQL; do
     mv -v %{buildroot}%{roundcubepath}/$i %{buildroot}%{_defaultdocdir}/%{name}/
 done
 
+# create a link for SQL
+%{__ln_s} %{_defaultdocdir}/%{name}/SQL %{buildroot}%{roundcubepath}/SQL
+
 # fdupes
 %if 0%{suse_version} >= 1100
 %fdupes %{buildroot}%{roundcubepath}
@@ -271,6 +274,7 @@ exit 0
 %{roundcubepath}/plugins/
 %{roundcubepath}/program/
 %{roundcubepath}/skins/
+%{roundcubepath}/SQL
 %{roundcubepath}/temp
 %dir %{_datadir}/php5
 %{_datadir}/php5/Roundcube/