OpenPKG Specs / changeset

     1.1 Binary file roundcube/linen_login.png has changed

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/roundcube/roundcube.patch	Sat Oct 06 20:29:43 2012 +0200
     2.3 @@ -0,0 +1,82 @@
     2.4 +diff -Nau plugins/managesieve/config.inc.php.dist.orig plugins/managesieve/config.inc.php.dist
     2.5 +Index: plugins/managesieve/config.inc.php.dist
     2.6 +--- plugins/managesieve/config.inc.php.dist.orig	2012-08-17 21:32:11.000000000 +0200
     2.7 ++++ plugins/managesieve/config.inc.php.dist	2012-09-28 22:47:43.934192601 +0200
     2.8 +@@ -1,7 +1,7 @@
     2.9 + <?php
    2.10 + 
    2.11 + // managesieve server port
    2.12 +-$rcmail_config['managesieve_port'] = 2000;
    2.13 ++$rcmail_config['managesieve_port'] = 4190;
    2.14 + 
    2.15 + // managesieve server address, default is localhost.
    2.16 + // Replacement variables supported in host name:
    2.17 +@@ -29,7 +29,7 @@
    2.18 + $rcmail_config['managesieve_usetls'] = false;
    2.19 + 
    2.20 + // default contents of filters script (eg. default spam filter)
    2.21 +-$rcmail_config['managesieve_default'] = '/etc/dovecot/sieve/global';
    2.22 ++$rcmail_config['managesieve_default'] = '@l_prefix@/var/dovecot/user/default.sieve';
    2.23 + 
    2.24 + // The name of the script which will be used when there's no user script
    2.25 + $rcmail_config['managesieve_script_name'] = 'managesieve';
    2.26 +diff -Nau skins/larry/styles.css.orig skins/larry/styles.css
    2.27 +Index: skins/larry/styles.css
    2.28 +--- skins/larry/styles.css.orig	2012-08-17 21:32:12.000000000 +0200
    2.29 ++++ skins/larry/styles.css	2012-09-29 00:40:20.367949231 +0200
    2.30 +@@ -535,7 +535,7 @@
    2.31 + }
    2.32 + 
    2.33 + #toplogo {
    2.34 +-	padding-top: 2px;
    2.35 ++	margin-top: -2px;
    2.36 + }
    2.37 + 
    2.38 + .topleft {
    2.39 +@@ -1207,7 +1207,7 @@
    2.40 + 
    2.41 + #login-form .box-inner {
    2.42 + 	width: 430px;
    2.43 +-	background: url(images/linen_login.jpg) top left no-repeat #5c5c5c;
    2.44 ++	background: url(images/linen_login.png) top left repeat-y #5c5c5c;
    2.45 + 	margin: 0 50px;
    2.46 + 	padding: 10px 24px 24px 24px;
    2.47 + 	border: 1px solid #333;
    2.48 +@@ -1286,7 +1286,12 @@
    2.49 + 	text-align: center;
    2.50 + }
    2.51 + 
    2.52 +-#login-form #logo {
    2.53 ++#logo {
    2.54 ++	margin-top: 10px;
    2.55 ++	margin-bottom: 10px;
    2.56 ++}
    2.57 ++
    2.58 ++#login-form {
    2.59 + 	margin-bottom: 20px;
    2.60 + }
    2.61 + 
    2.62 +diff -Nau plugins/rcguard/rcguard.js.orig plugins/rcguard/rcguard.js
    2.63 +Index: plugins/rcguard/rcguard.js
    2.64 +--- plugins/rcguard/rcguard.js.orig	1970-01-01 01:00:00.000000000 +0100
    2.65 ++++ plugins/rcguard/rcguard.js	2012-09-29 00:45:05.476274988 +0200
    2.66 +@@ -1,4 +1,5 @@
    2.67 + var RecaptchaOptions = {
    2.68 +-  theme : 'white',
    2.69 +-  lang: 'en'
    2.70 ++  theme : 'blackglass',
    2.71 ++  labindex : 2,
    2.72 ++  lang: 'fr'
    2.73 + };
    2.74 +diff -Nau plugins/rcguard/skins/default/rcguard.css.orig plugins/rcguard/skins/default/rcguard.css
    2.75 +Index: plugins/rcguard/skins/default/rcguard.css
    2.76 +--- plugins/rcguard/skins/default/rcguard.css.orig	1970-01-01 01:00:00.000000000 +0100
    2.77 ++++ plugins/rcguard/skins/default/rcguard.css	2012-09-29 00:48:10.172252103 +0200
    2.78 +@@ -7,4 +7,7 @@
    2.79 + #recaptcha_area {
    2.80 + 	margin: 0 auto;
    2.81 + 	padding-left: 24px;
    2.82 ++	padding-top: 30px;
    2.83 ++	padding-bottom: 16px;
    2.84 ++	padding-left: 16px;
    2.85 + }

     3.1 --- a/roundcube/roundcube.spec	Sat Oct 06 16:24:01 2012 +0200
     3.2 +++ b/roundcube/roundcube.spec	Sat Oct 06 20:29:43 2012 +0200
     3.3 @@ -21,6 +21,9 @@
     3.4  ##  SUCH DAMAGE.
     3.5  ##
     3.6  
     3.7 +#   package version
     3.8 +%define       V_plug_rcguard  0.2.0-39-g6d98249
     3.9 +
    3.10  #   package information
    3.11  Name:         roundcube
    3.12  Summary:      Roundcube Webmail Client
    3.13 @@ -31,11 +34,14 @@
    3.14  Class:        EVAL
    3.15  Group:        Mail
    3.16  License:      GPL
    3.17 -Version:      0.8.1
    3.18 +Version:      0.8.2
    3.19  Release:      20120800
    3.20  
    3.21  #   list of sources
    3.22  Source0:      http://switch.dl.sourceforge.net/roundcubemail/%{version}/roundcubemail-%{version}.tar.gz
    3.23 +Source1:      https://www.github.com/dennylin93/rcguard/tarball/master/dennylin93-rcguard-%{V_plug_rcguard}.tar.gz
    3.24 +Source2:      linen_login.png
    3.25 +Patch0:       roundcube.patch
    3.26  
    3.27  #   build information
    3.28  BuildPreReq:  OpenPKG, openpkg >= 20100101
    3.29 @@ -43,7 +49,7 @@
    3.30  PreReq:       MTA, apache, apache-php
    3.31  PreReq:       apache-php::with_xml = yes
    3.32  PreReq:       apache-php::with_json = yes
    3.33 -PreReq:       apache-php::with_exim = yes
    3.34 +PreReq:       apache-php::with_exif = yes
    3.35  PreReq:       apache-php::with_mcrypt = yes
    3.36  PreReq:       apache-php::with_iconv = yes
    3.37  PreReq:       apache-php::with_session = yes
    3.38 @@ -64,9 +70,14 @@
    3.39  
    3.40  %prep
    3.41      %setup -q -n roundcubemail-%{version}
    3.42 +    %setup -q -n roundcubemail-%{version} -D -T -a 1
    3.43      %{l_shtool} subst \
    3.44          -e 's;\(E_ALL&~E_NOTICE\));\1&~E_STRICT);' \
    3.45          installer/index.php
    3.46 +    mv dennylin93-rcguard-* plugins/rcguard
    3.47 +    %patch -p0
    3.48 +    %{l_shtool} subst %{l_value -s -a} \
    3.49 +        plugins/managesieve/config.inc.php.dist
    3.50  
    3.51  %build
    3.52  
    3.53 @@ -81,15 +92,22 @@
    3.54          $RPM_BUILD_ROOT%{l_prefix}/share/roundcube/
    3.55      %{l_shtool} install -c -m 644 \
    3.56          index.php robots.txt \
    3.57 -        opkg_large.png opkg_small.png \
    3.58          $RPM_BUILD_ROOT%{l_prefix}/share/roundcube/
    3.59  
    3.60 +    #   install other components
    3.61 +    ( cd $RPM_BUILD_ROOT%{l_prefix}/share/roundcube/plugins/rcguard/skins \
    3.62 +      && ln -s default larry )
    3.63 +    %{l_shtool} install -c -m 644 \
    3.64 +        %{SOURCE linen_login.png} \
    3.65 +        $RPM_BUILD_ROOT%{l_prefix}/share/roundcube/skins/larry/images/
    3.66 +
    3.67      #   determine package ingredients and tag config files
    3.68 -#'%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/share/roundcube'
    3.69      %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
    3.70          %{l_files_std} \
    3.71 -        '%attr(775,-,%{l_ngrp}) %{l_prefix}/share/roundcube/temp'
    3.72 -        '%attr(775,-,%{l_ngrp}) %{l_prefix}/share/roundcube/logs'
    3.73 +        '%attr(775,-,%{l_ngrp}) %{l_prefix}/share/roundcube/temp' \
    3.74 +        '%attr(775,-,%{l_ngrp}) %{l_prefix}/share/roundcube/logs' \
    3.75 +        '%config %attr(640,%{l_mgrp},%{l_ngrp}) %{l_prefix}/share/roundcube/config/*' \
    3.76 +        '%config %attr(640,%{l_mgrp},%{l_ngrp}) %{l_prefix}/share/roundcube/plugins/*/*config*'
    3.77  
    3.78  %files -f files
    3.79  
    3.80 @@ -103,7 +121,7 @@
    3.81            echo "out the SQL configuration, something like:"
    3.82            echo ""
    3.83            echo "CREATE DATABASE roundcubemail;"
    3.84 -          echo "CREATE USER 'username'@'localhost' IDENTIFIED BY 'newpwd';
    3.85 +          echo "CREATE USER 'username'@'localhost' IDENTIFIED BY 'newpwd';"
    3.86            echo "GRANT ALL PRIVILEGES ON roundcubemail.* TO username@localhost IDENTIFIED BY 'newpwd';"
    3.87            echo "FLUSH PRIVILEGES;"
    3.88          ) | %{l_rpmtool} msg -b -t notice