packages: roundcubemail/roundcubemail-faq-page.patch, roundcubemail/roundcu...

[glen]

Author: glen                         Date: Mon Aug 23 10:43:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.4, not really tested

---- Files affected:
packages/roundcubemail:
   roundcubemail-faq-page.patch (1.4 -> 1.5) , roundcubemail.spec (1.96 -> 1.97) 

---- Diffs:

================================================================
Index: packages/roundcubemail/roundcubemail-faq-page.patch
diff -u packages/roundcubemail/roundcubemail-faq-page.patch:1.4 packages/roundcubemail/roundcubemail-faq-page.patch:1.5
--- packages/roundcubemail/roundcubemail-faq-page.patch:1.4	Sun Nov 29 17:22:10 2009
+++ packages/roundcubemail/roundcubemail-faq-page.patch	Mon Aug 23 12:43:28 2010
@@ -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 @@

================================================================
Index: packages/roundcubemail/roundcubemail.spec
diff -u packages/roundcubemail/roundcubemail.spec:1.96 packages/roundcubemail/roundcubemail.spec:1.97
--- packages/roundcubemail/roundcubemail.spec:1.96	Sun Jun 13 00:56:28 2010
+++ packages/roundcubemail/roundcubemail.spec	Mon Aug 23 12:43:28 2010
@@ -16,12 +16,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
@@ -33,7 +33,7 @@
 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)
@@ -127,7 +127,13 @@
 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
@@ -161,7 +167,7 @@
 
 # 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
@@ -238,7 +244,7 @@
 %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
@@ -312,6 +318,7 @@
 %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
@@ -347,6 +354,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2010/08/23 10:43:28  glen
+- up to 0.4, not really tested
+
 Revision 1.96  2010/06/12 22:56:28  glen
 - allow fileinfo ext from php53, not just pecl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/roundcubemail/roundcubemail-faq-page.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/roundcubemail/roundcubemail.spec?r1=1.96&r2=1.97&f=u