1
0
forked from pool/roundcubemail
Cristian Rodríguez 2010-11-24 21:11:15 +00:00 committed by Git OBS Bridge
parent 4c19a5f3fd
commit 856890d15f
6 changed files with 44 additions and 17 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:124dfe8cd73ca5215f09e88810bcd3041cb791d5eb39ce4cf3dfcdf63d658107
size 1570110

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3ea1485879db38f8def14a4b9e244e4da5f763400b281045eefd5c3dc70ff52
size 1757845

View File

@ -1,13 +1,19 @@
Index: program/include/iniset.php
===================================================================
--- program/include/iniset.php.orig
+++ program/include/iniset.php
@@ -30,7 +30,7 @@ if (!defined('INSTALL_PATH')) {
define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
--- roundcubemail-0.4.2/program/include/iniset.php.orig
+++ roundcubemail-0.4.2/program/include/iniset.php
@@ -40,14 +40,13 @@ define('RCMAIL_VERSION', '0.4.2');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
define('RCMAIL_START', microtime(true));
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
if (!defined('INSTALL_PATH')) {
define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
}
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
-if (!defined('RCMAIL_CONFIG_DIR')) {
- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
-}
+
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {

14
roundcubemail-rpmlintrc Normal file
View File

@ -0,0 +1,14 @@
addFilter("devel-file-in-non-devel-package")
addFilter("files-duplicate /srv/www/roundcubemail/plugins/archive/localization/es_AR.inc")
addFilter("files-duplicate /srv/www/roundcubemail/plugins/vcard_attachments/localization/de_CH.inc")
addFilter("files-duplicate /etc/roundcubemail/main.inc.php.dist")
addFilter("files-duplicate /srv/www/roundcubemail/plugins/password/localization/de_CH.inc")
addFilter("files-duplicate /srv/www/roundcubemail/plugins/help/localization/en_GB.inc")
addFilter("files-duplicate /srv/www/roundcubemail/skins/default/images/blank.gif")
addFilter("files-duplicate /etc/roundcubemail/db.inc.php")
addFilter("files-duplicate /srv/www/roundcubemail/plugins/archive/localization/de_DE.inc")
addFilter("files-duplicate /srv/www/roundcubemail/plugins/subscriptions_option/localization/de_CH.inc")
addFilter("files-duplicate /srv/www/roundcubemail/plugins/new_user_dialog/localization/de_CH.inc")
addFilter("non-executable-script /srv/www/roundcubemail/plugins/password/drivers/chpass-wrapper.py")
addFilter("wrong-file-end-of-line-encoding /usr/share/doc/packages/roundcubemail/SQL/mssql.initial.sql")
addFilter("wrong-file-end-of-line-encoding /usr/share/doc/packages/roundcubemail/SQL/mssql.upgrade.sql")

View File

@ -1,4 +1,10 @@
-------------------------------------------------------------------
Sat Nov 20 19:48:41 UTC 2010 - toganm@opensuse.org
- update to 0.4.2
- fixed the roundcubemail-config-dir.patch so it applies again
- worked around warnings with roundcubemail-rpmlintrc
-------------------------------------------------------------------
Wed Nov 04 12:00:00 CET 2009 - opensuse@dstoecker.de
- update to 0.3.1:

View File

@ -12,15 +12,17 @@ Summary: A modern browser-based multilingual IMAP client
Group: Productivity/Networking/Email/Clients
License: GNU General Public License (GPL)
Url: http://www.roundcube.net/
Version: 0.3.1
Version: 0.4.2
Release: 0
BuildRequires: apache2-devel pcre-devel
Requires: http_daemon mod_php_any php-session php-mysql php-iconv
Requires: php-gettext php-mbstring php-openssl
Source0: %{name}-%{version}.tar.bz2
Source1: roundcubemail-README.SUSE
Source2: roundcubemail-httpd.conf
Patch1: roundcubemail-config-dir.patch
Source1: %{name}-README.SUSE
Source2: %{name}-httpd.conf
Source3: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE use the general config directory /etc
Patch0: %{name}-config-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%define apache_serverroot %(/usr/sbin/apxs2 -q DATADIR)
@ -40,7 +42,7 @@ The user interface is fully skinnable using XHTML and CSS 2.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p0
%patch0 -p1
%build
@ -87,7 +89,6 @@ rm -rf %buildroot
%{roundcubepath}/index.php
%{roundcubepath}/robots.txt
%attr(0755,root,root) %{roundcubepath}/bin/*.sh
%{roundcubepath}/bin/*.php
%dir %{roundcubepath}/bin
%{roundcubepath}/installer/
%{roundcubepath}/logs/