- up to 0.4, not really tested

Changed files:
    roundcubemail-faq-page.patch -> 1.5
    roundcubemail.spec -> 1.97

diff --git a/roundcubemail-faq-page.patch b/roundcubemail-faq-page.patch
index 8f49e9f2765ff40a78742f2f557d7d71c72e9db9..78f4b965ab37fbe2dde9f2686b07138f4fc9a166 100644 (file)
--- a/roundcubemail-faq-page.patch
+++ b/roundcubemail-faq-page.patch
@@ -12,17 +12,17 @@
  }
  
  // don't check for valid request tokens in these actions
---- roundcubemail-0.3.1/program/include/rcmail.php.orig        2009-09-25 09:25:41.000000000 +0200
-+++ roundcubemail-0.3.1/program/include/rcmail.php     2009-11-29 18:14:51.000000000 +0100
+--- roundcubemail-0.4/program/include/rcmail.php~      2010-08-06 17:59:34.000000000 +0300
++++ roundcubemail-0.4/program/include/rcmail.php       2010-08-23 13:33:22.411426529 +0300
 @@ -28,7 +28,7 @@
   */
  class rcmail
  {
--  static public $main_tasks = array('mail','settings','addressbook','login','logout','dummy');
-+  static public $main_tasks = array('mail','settings','addressbook','faq','login','logout','dummy');
-   
+-  static public $main_tasks = array('mail','settings','addressbook','login','logout','utils','dummy');
++  static public $main_tasks = array('mail','settings','addressbook','faq','login','logout','utils','dummy');
+ 
    static private $instance;
-   
+ 
 --- /dev/null  2008-11-04 20:33:38.146691408 +0200
 +++ roundcubemail-0.2.1/skins/default/templates/faq.html       2009-01-21 09:22:58.000000000 +0200
 @@ -0,0 +1,16 @@

diff --git a/roundcubemail.spec b/roundcubemail.spec
index 115fd712fb92f1b1b434e485456c74fbd8873f7c..435eb9c806ba6a1a9b7d3f92f54ff83950ff4881 100644 (file)
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -15,12 +15,12 @@
 Summary:       RoundCube Webmail
 Summary(pl.UTF-8):     RoundCube Webmail - poczta przez WWW
 Name:          roundcubemail
-Version:       0.3.1
-Release:       2
+Version:       0.4
+Release:       1
 License:       GPL v2
 Group:         Applications/Mail
 Source0:       http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}.tar.gz
-# Source0-md5: 34e8e18772e7eada8769b6c5c20f7c8e
+# Source0-md5: 6e5d2313087ce1e1209eb0f4fd71beab
 Source1:       %{name}.config
 Source2:       %{name}.logrotate
 Source3:       %{name}-lighttpd.conf
@@ -32,7 +32,7 @@ Patch2:               %{name}-postfixadmin-pl_locales.patch
 Patch3:                %{name}-faq-page.patch
 Patch4:                %{name}-password-anon-ldap-bind.patch
 URL:           http://www.roundcube.net/
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.553
 BuildRequires: sed >= 4.0
 Requires:      %{name}-skin
 Requires:      php(dom)
@@ -126,7 +126,13 @@ Domyślna skórka dla RoundCube Webmaila.
 find -name .svn | xargs -r rm -rf
 
 # undos the source
-find '(' -name '*.php' -o -name '*.inc' -o -name '*.js' -o -name '*.css' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
+%undos -f php,inc,js,css
+
+# kill extensions and fill proper shebang
+%{__sed} -i -e '1s,^#!.*php,#!%{__php},' bin/*.sh
+for a in bin/*.sh; do
+       mv $a ${a%.sh}
+done
 
 mv config/db.inc.php.dist config/db.inc.php
 mv config/main.inc.php.dist config/main.inc.php
@@ -160,7 +166,7 @@ install -d $RPM_BUILD_ROOT{%{_appdatadir},%{_applogdir},%{_archivelogdir},%{_sys
 
 # Main application part:
 cp -a program/* $RPM_BUILD_ROOT%{_appdir}/program
-cp -a bin/*.php $RPM_BUILD_ROOT%{_appdir}/bin
+cp -a bin/* $RPM_BUILD_ROOT%{_appdir}/bin
 cp -a index.php $RPM_BUILD_ROOT%{_appdir}
 
 # Skins installation
@@ -237,7 +243,7 @@ fi
 %dir %{_appdir}
 %{_appdir}/*.php
 %dir %{_appdir}/bin
-%{_appdir}/bin/*.php
+%attr(755,root,root) %{_appdir}/bin/*
 %dir %{_appdir}/config
 %{_appdir}/config/*.php
 %dir %{_appdir}/program
@@ -311,6 +317,7 @@ fi
 %lang(sq) %{_appdir}/program/localization/sq_AL
 %lang(sr) %{_appdir}/program/localization/sr_CS
 %lang(sv) %{_appdir}/program/localization/sv_SE
+%lang(ta_IN) %{_appdir}/program/localization/ta_IN
 %lang(th) %{_appdir}/program/localization/th_TH
 %lang(tr) %{_appdir}/program/localization/tr_TR
 %lang(uk) %{_appdir}/program/localization/uk_UA