Accepting request 62288 from home:wrosenauer

I think RPMlint won't be happy with a macro in a comment. Looks OK though.

OBS-URL: https://build.opensuse.org/request/show/62288
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=25

roundcubemail-config-dir.patch

@@ -1,6 +1,19 @@
---- roundcubemail-0.4.2/program/include/iniset.php.orig
-+++ roundcubemail-0.4.2/program/include/iniset.php
-@@ -40,14 +40,13 @@ define('RCMAIL_VERSION', '0.4.2');
+diff -ur roundcubemail-0.5.1.old/installer/index.php roundcubemail-0.5.1/installer/index.php
+--- roundcubemail-0.5.1.old/installer/index.php	2010-09-25 15:03:53.000000000 +0200
++++ roundcubemail-0.5.1/installer/index.php	2011-02-21 11:03:44.000000000 +0100
+@@ -4,7 +4,7 @@
+ ini_set('display_errors', 1);
+ 
+ define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
+-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
++define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+ 
+ $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
+ $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
+diff -ur roundcubemail-0.5.1.old/program/include/iniset.php roundcubemail-0.5.1/program/include/iniset.php
+--- roundcubemail-0.5.1.old/program/include/iniset.php	2011-01-29 15:55:12.000000000 +0100
++++ roundcubemail-0.5.1/program/include/iniset.php	2011-02-21 11:02:18.000000000 +0100
+@@ -40,14 +40,13 @@
  define('RCMAIL_CHARSET', 'UTF-8');
  define('JS_OBJECT_NAME', 'rcmail');
  define('RCMAIL_START', microtime(true));

roundcubemail.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Feb 21 09:58:15 UTC 2011 - wr@rosenauer.org
+
+- patch installer to use /etc/roundcubemail as config dir
+  (installer workflow is broken otherwise)
+- create temp subdirectory writable for Apache
+- line ending conversion disabled (it broke a lot of PNGs)
+- *.dist files are not %config
+
 -------------------------------------------------------------------
 Fri Feb 11 21:20:53 UTC 2011 - toganm@opensuse.org
 
@@ -6,17 +15,20 @@ Fri Feb 11 21:20:53 UTC 2011 - toganm@opensuse.org
     version and also improves security by preventing some possible CSRF
     attacks. IDNA support has now been improved and some visual glitches
     in IE and Safari have been resolved.
+
 -------------------------------------------------------------------
 Wed Jan 12 19:35:31 UTC 2011 - toganm@opensuse.org
 
 - Update to 0.5 for changes read CHANGELOG
 - fixed rpmlint warning for languages
+
 -------------------------------------------------------------------
 Sat Nov 20 19:48:41 UTC 2010 - toganm@opensuse.org
 
 - update to 0.4.2
 - fixed the roundcubemail-config-dir.patch so it applies again
 - worked around warnings with roundcubemail-rpmlintrc
+
 -------------------------------------------------------------------
 Wed Nov 04 12:00:00 CET 2009 - opensuse@dstoecker.de
 

roundcubemail.spec

@@ -69,9 +69,10 @@ sed -e "s#__ROUNDCUBEPATH__#%{roundcubepath}#g" -e "s#__HTTPCONFDIR__#%{apache_s
 # no need to check .htaccess each time, the apache config takes care of the restrictions
 find %buildroot/%{roundcubepath} -name .htaccess -delete
 # fix wrong end of line encoding
-for file in $(find %buildroot/%{roundcubepath} -type f); do
-	sed -i 's/\x0D$//' $file
-done
+# FIXME this breaks some PNGs!
+#for file in $(find %buildroot/%{roundcubepath} -type f); do
+#	sed -i 's/\x0D$//' $file
+#done
 
 %clean
 rm -rf %buildroot
@@ -81,7 +82,7 @@ rm -rf %buildroot
 %doc %_defaultdocdir/%name/
 %dir %{roundcubepath}
 %dir %{roundcubeconfigpath}
-%config %{roundcubeconfigpath}/*.dist
+%{roundcubeconfigpath}/*.dist
 %config(noreplace) %{roundcubeconfigpath}/db.inc.php
 %config(noreplace) %{roundcubeconfigpath}/main.inc.php
 %config(noreplace) %{roundcubeconfigpath}/mimetypes.php
@@ -95,6 +96,6 @@ rm -rf %buildroot
 %{roundcubepath}/plugins/
 %{roundcubepath}/program/
 %{roundcubepath}/skins/
-%{roundcubepath}/temp/
+%attr(-, wwwrun, root) %{roundcubepath}/temp/
 
 %changelog