- add FAQ page support from templates

Changed files:
    roundcubemail-faq-page.patch -> 1.1
    roundcubemail.spec -> 1.27

diff --git a/roundcubemail-faq-page.patch b/roundcubemail-faq-page.patch
new file mode 100644 (file)
index 0000000..9ce0604
--- /dev/null
+++ b/roundcubemail-faq-page.patch
@@ -0,0 +1,24 @@
+--- roundcubemail-nightly-20070318/index.php   2007-04-12 18:02:59.274319751 +0300
++++ roundcubemail-nightly-20070318/index.php   2007-04-12 19:29:32.262254092 +0300
+@@ -47,7 +47,7 @@
+ $OUTPUT_TYPE = 'html';
+ $JS_OBJECT_NAME = 'rcmail';
+ $INSTALL_PATH = dirname(__FILE__);
+-$MAIN_TASKS = array('mail','settings','addressbook','logout');
++$MAIN_TASKS = array('mail','settings','addressbook','logout', 'faq');
+ 
+ if (empty($INSTALL_PATH))
+   $INSTALL_PATH = './';
+@@ -187,6 +187,12 @@
+     }
+   }
+ 
++// display faq template
++if ($_task=='faq')
++  {
++    parse_template($_task);
++  }
++
+ // end session
+ else if ($_action=='logout' && isset($_SESSION['user_id']))
+   {

diff --git a/roundcubemail.spec b/roundcubemail.spec
index 0f472bd6d2dd68978269370c42918a59a8dc2638..355018f862ee8c7aa3e572093379e21941e7afdc 100644 (file)
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -9,7 +9,7 @@
 #define                _svn    svn445
 %define                _snap   20070318
 #define                _beta   beta2
-%define                _rel    0.11
+%define                _rel    0.13
 Summary:       RoundCube Webmail
 Summary(pl.UTF-8):     RoundCube Webmail - poczta przez WWW
 Name:          roundcubemail
@@ -23,6 +23,7 @@ Source0:      http://dl.sourceforge.net/roundcubemail/%{name}-nightly-%{_snap}.tar.gz
 # Source0-md5: 3e4dc0f840e51a76524f55914ed644e5
 Source1:       %{name}.config
 Patch0:                %{name}-config.patch
+Patch1:                %{name}-faq-page.patch
 URL:           http://www.roundcube.net/
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
@@ -73,11 +74,12 @@ Domyślna skórka dla RoundCube Webmaila.
 %prep
 %setup -q -n %{name}-%{?_snap:nightly-%{_snap}}%{!?_snap:%{version}%{?_svn}%{?_beta}}
 %patch0 -p1
+%patch1 -p1
 
 find -name .svn | xargs -r rm -rf
 
 # undos the source
-find '(' -name '*.php' -o -name '*.inc' -o -name '*.js' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
+find '(' -name '*.php' -o -name '*.inc' -o -name '*.js' -o -name '*.css' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
 %install
 rm -rf $RPM_BUILD_ROOT