# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1349548183 -7200
# Node ID baeac098d68f9e48c5b54cf0985f7928aedbc27f
# Parent  914043724d209f0f4e58154ae9166c6c198b274a
Correct packaging flaws, improve and patch, and update to new version.

diff -r 914043724d20 -r baeac098d68f roundcube/linen_login.png
Binary file roundcube/linen_login.png has changed
diff -r 914043724d20 -r baeac098d68f roundcube/roundcube.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/roundcube/roundcube.patch	Sat Oct 06 20:29:43 2012 +0200
@@ -0,0 +1,82 @@
+diff -Nau plugins/managesieve/config.inc.php.dist.orig plugins/managesieve/config.inc.php.dist
+Index: plugins/managesieve/config.inc.php.dist
+--- plugins/managesieve/config.inc.php.dist.orig	2012-08-17 21:32:11.000000000 +0200
++++ plugins/managesieve/config.inc.php.dist	2012-09-28 22:47:43.934192601 +0200
+@@ -1,7 +1,7 @@
+ <?php
+ 
+ // managesieve server port
+-$rcmail_config['managesieve_port'] = 2000;
++$rcmail_config['managesieve_port'] = 4190;
+ 
+ // managesieve server address, default is localhost.
+ // Replacement variables supported in host name:
+@@ -29,7 +29,7 @@
+ $rcmail_config['managesieve_usetls'] = false;
+ 
+ // default contents of filters script (eg. default spam filter)
+-$rcmail_config['managesieve_default'] = '/etc/dovecot/sieve/global';
++$rcmail_config['managesieve_default'] = '@l_prefix@/var/dovecot/user/default.sieve';
+ 
+ // The name of the script which will be used when there's no user script
+ $rcmail_config['managesieve_script_name'] = 'managesieve';
+diff -Nau skins/larry/styles.css.orig skins/larry/styles.css
+Index: skins/larry/styles.css
+--- skins/larry/styles.css.orig	2012-08-17 21:32:12.000000000 +0200
++++ skins/larry/styles.css	2012-09-29 00:40:20.367949231 +0200
+@@ -535,7 +535,7 @@
+ }
+ 
+ #toplogo {
+-	padding-top: 2px;
++	margin-top: -2px;
+ }
+ 
+ .topleft {
+@@ -1207,7 +1207,7 @@
+ 
+ #login-form .box-inner {
+ 	width: 430px;
+-	background: url(images/linen_login.jpg) top left no-repeat #5c5c5c;
++	background: url(images/linen_login.png) top left repeat-y #5c5c5c;
+ 	margin: 0 50px;
+ 	padding: 10px 24px 24px 24px;
+ 	border: 1px solid #333;
+@@ -1286,7 +1286,12 @@
+ 	text-align: center;
+ }
+ 
+-#login-form #logo {
++#logo {
++	margin-top: 10px;
++	margin-bottom: 10px;
++}
++
++#login-form {
+ 	margin-bottom: 20px;
+ }
+ 
+diff -Nau plugins/rcguard/rcguard.js.orig plugins/rcguard/rcguard.js
+Index: plugins/rcguard/rcguard.js
+--- plugins/rcguard/rcguard.js.orig	1970-01-01 01:00:00.000000000 +0100
++++ plugins/rcguard/rcguard.js	2012-09-29 00:45:05.476274988 +0200
+@@ -1,4 +1,5 @@
+ var RecaptchaOptions = {
+-  theme : 'white',
+-  lang: 'en'
++  theme : 'blackglass',
++  labindex : 2,
++  lang: 'fr'
+ };
+diff -Nau plugins/rcguard/skins/default/rcguard.css.orig plugins/rcguard/skins/default/rcguard.css
+Index: plugins/rcguard/skins/default/rcguard.css
+--- plugins/rcguard/skins/default/rcguard.css.orig	1970-01-01 01:00:00.000000000 +0100
++++ plugins/rcguard/skins/default/rcguard.css	2012-09-29 00:48:10.172252103 +0200
+@@ -7,4 +7,7 @@
+ #recaptcha_area {
+ 	margin: 0 auto;
+ 	padding-left: 24px;
++	padding-top: 30px;
++	padding-bottom: 16px;
++	padding-left: 16px;
+ }
diff -r 914043724d20 -r baeac098d68f roundcube/roundcube.spec
--- a/roundcube/roundcube.spec	Sat Oct 06 16:24:01 2012 +0200
+++ b/roundcube/roundcube.spec	Sat Oct 06 20:29:43 2012 +0200
@@ -21,6 +21,9 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package version
+%define       V_plug_rcguard  0.2.0-39-g6d98249
+
 #   package information
 Name:         roundcube
 Summary:      Roundcube Webmail Client
@@ -31,11 +34,14 @@
 Class:        EVAL
 Group:        Mail
 License:      GPL
-Version:      0.8.1
+Version:      0.8.2
 Release:      20120800
 
 #   list of sources
 Source0:      http://switch.dl.sourceforge.net/roundcubemail/%{version}/roundcubemail-%{version}.tar.gz
+Source1:      https://www.github.com/dennylin93/rcguard/tarball/master/dennylin93-rcguard-%{V_plug_rcguard}.tar.gz
+Source2:      linen_login.png
+Patch0:       roundcube.patch
 
 #   build information
 BuildPreReq:  OpenPKG, openpkg >= 20100101
@@ -43,7 +49,7 @@
 PreReq:       MTA, apache, apache-php
 PreReq:       apache-php::with_xml = yes
 PreReq:       apache-php::with_json = yes
-PreReq:       apache-php::with_exim = yes
+PreReq:       apache-php::with_exif = yes
 PreReq:       apache-php::with_mcrypt = yes
 PreReq:       apache-php::with_iconv = yes
 PreReq:       apache-php::with_session = yes
@@ -64,9 +70,14 @@
 
 %prep
     %setup -q -n roundcubemail-%{version}
+    %setup -q -n roundcubemail-%{version} -D -T -a 1
     %{l_shtool} subst \
         -e 's;\(E_ALL&~E_NOTICE\));\1&~E_STRICT);' \
         installer/index.php
+    mv dennylin93-rcguard-* plugins/rcguard
+    %patch -p0
+    %{l_shtool} subst %{l_value -s -a} \
+        plugins/managesieve/config.inc.php.dist
 
 %build
 
@@ -81,15 +92,22 @@
         $RPM_BUILD_ROOT%{l_prefix}/share/roundcube/
     %{l_shtool} install -c -m 644 \
         index.php robots.txt \
-        opkg_large.png opkg_small.png \
         $RPM_BUILD_ROOT%{l_prefix}/share/roundcube/
 
+    #   install other components
+    ( cd $RPM_BUILD_ROOT%{l_prefix}/share/roundcube/plugins/rcguard/skins \
+      && ln -s default larry )
+    %{l_shtool} install -c -m 644 \
+        %{SOURCE linen_login.png} \
+        $RPM_BUILD_ROOT%{l_prefix}/share/roundcube/skins/larry/images/
+
     #   determine package ingredients and tag config files
-#'%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/share/roundcube'
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%attr(775,-,%{l_ngrp}) %{l_prefix}/share/roundcube/temp'
-        '%attr(775,-,%{l_ngrp}) %{l_prefix}/share/roundcube/logs'
+        '%attr(775,-,%{l_ngrp}) %{l_prefix}/share/roundcube/temp' \
+        '%attr(775,-,%{l_ngrp}) %{l_prefix}/share/roundcube/logs' \
+        '%config %attr(640,%{l_mgrp},%{l_ngrp}) %{l_prefix}/share/roundcube/config/*' \
+        '%config %attr(640,%{l_mgrp},%{l_ngrp}) %{l_prefix}/share/roundcube/plugins/*/*config*'
 
 %files -f files
 
@@ -103,7 +121,7 @@
           echo "out the SQL configuration, something like:"
           echo ""
           echo "CREATE DATABASE roundcubemail;"
-          echo "CREATE USER 'username'@'localhost' IDENTIFIED BY 'newpwd';
+          echo "CREATE USER 'username'@'localhost' IDENTIFIED BY 'newpwd';"
           echo "GRANT ALL PRIVILEGES ON roundcubemail.* TO username@localhost IDENTIFIED BY 'newpwd';"
           echo "FLUSH PRIVILEGES;"
         ) | %{l_rpmtool} msg -b -t notice