1
0
forked from pool/roundcubemail
Lars Vogdt 2008-09-23 11:17:36 +00:00 committed by Git OBS Bridge
parent b4004b43e6
commit 28fce69823
6 changed files with 54 additions and 33 deletions

View File

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

View File

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

View File

@ -0,0 +1,13 @@
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']).'/');
}
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {

View File

@ -20,7 +20,7 @@
php_admin_flag file_uploads on
php_admin_value upload_max_filesize 5M
php_admin_value error_log logs/errors
php_admin_value open_basedir "__ROUNDCUBEPATH__:/tmp"
php_admin_value open_basedir "__ROUNDCUBEPATH__:/etc/roundcubemail:/tmp"
<Directory __ROUNDCUBEPATH__>
<FilesMatch "(\.inc|\~)$|^_">

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 23 13:09:19 CEST 2008 - lrupp@suse.de
- update to 0.2-Beta
- move config directory to /etc/roundcubemail
- fix wrong line end encoding
-------------------------------------------------------------------
Thu Jul 24 10:39:32 CEST 2008 - lrupp@suse.de

View File

@ -8,26 +8,26 @@
# norootforbuild
Name: roundcubemail
BuildRequires: apache2-devel pcre-devel
Version: 0.2a1
%define real_version 0.2-alpha
Release: 0
Requires: http_daemon mod_php_any php-session php-mysql php-iconv
Requires: php-gettext php-mbstring php-openssl
# needed for apache_sysconfdir and apache_serverroot
BuildRequires: apache2-devel
Summary: A modern browser-based multilingual IMAP client
Group: Productivity/Networking/Email/Clients
License: GNU General Public License (GPL)
Url: http://www.roundcube.net/
Summary: A modern browser-based multilingual IMAP client.
Source0: %{name}-0.2-alpha.1.tar.bz2
Version: 0.2b1
%define real_version 0.2-beta
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}-%{real_version}.tar.bz2
Source1: roundcubemail-README.SUSE
Source2: roundcubemail-httpd.conf
Patch1: roundcubemail-config-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%define apache_serverroot %(/usr/sbin/apxs2 -q DATADIR)
%define apache_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)
%define roundcubepath %{apache_serverroot}/%name
%define roundcubeconfigpath %_sysconfdir/%name
%description
RoundCube Webmail is a browser-based multilingual IMAP client with an
@ -41,14 +41,18 @@ The user interface is fully skinnable using XHTML and CSS 2.
%prep
%setup -q -n %{name}-%{real_version}
%patch1 -p0
%build
%install
install -d -m 0755 %buildroot/%roundcubepath
cp -a * %buildroot/%{roundcubepath}/
mv config/db.inc.php.dist %buildroot/%{roundcubepath}/config/db.inc.php
mv config/main.inc.php.dist %buildroot/%{roundcubepath}/config/main.inc.php
mkdir -p %buildroot/%_sysconfdir/%name
cp config/db.inc.php.dist %buildroot/%{roundcubeconfigpath}/db.inc.php
cp config/main.inc.php.dist %buildroot/%{roundcubeconfigpath}/main.inc.php
cp config/* %buildroot/%{roundcubeconfigpath}/
rm -rf %buildroot/%{roundcubepath}/config
# install httpd.conf file and adapt the configuration
install -d -m 0755 %buildroot/%{apache_sysconfdir}/conf.d
@ -62,35 +66,32 @@ done
sed -e "s#__ROUNDCUBEPATH__#%{roundcubepath}#g" -e "s#__HTTPCONFDIR__#%{apache_sysconfdir}/conf.d#g" %{SOURCE1} > %buildroot/%_defaultdocdir/%name/README.SUSE
# no need to check .htaccess each time, the apache config takes care of the restrictions
# rm %buildroot/%{roundcubepath}/.htaccess
rm %buildroot/%{roundcubepath}/config/.htaccess
rm %buildroot/%{roundcubepath}/logs/.htaccess
rm %buildroot/%{roundcubepath}/temp/.htaccess
find %buildroot/%{roundcubepath} -name .htaccess -delete
# fix wrong end of line encoding
for file in $(find %buildroot/%{roundcubepath} -type f); do
sed -i 's/\x0D$//' $file
done
%clean
rm -rf %buildroot
%post
if [ ${1:-0} -gt 1 ]; then
# check if we update from an older version
echo "Warning: Please read %_defaultdocdir/%name/UPGRADING bevore you proceed!"
fi
%files
%defattr(-, root, root)
%defattr(0644, root, root,0755)
%doc %_defaultdocdir/%name/
%dir %{roundcubepath}
%dir %{roundcubepath}/config
%config(noreplace) %{roundcubepath}/config/db.inc.php
%config(noreplace) %{roundcubepath}/config/main.inc.php
%dir %{roundcubeconfigpath}
%config %{roundcubeconfigpath}/*.dist
%config(noreplace) %{roundcubeconfigpath}/db.inc.php
%config(noreplace) %{roundcubeconfigpath}/main.inc.php
%config(noreplace) %{apache_sysconfdir}/conf.d/roundcubemail.conf
%{roundcubepath}/index.php
%{roundcubepath}/robots.txt
%{roundcubepath}/bin/
%{roundcubepath}/config/*.dist
%attr(0755,root,root) %{roundcubepath}/bin/*.sh
%{roundcubepath}/bin/*.php
%{roundcubepath}/installer/
%{roundcubepath}/logs/
%{roundcubepath}/program/
%{roundcubepath}/skins/
%{roundcubepath}/temp/
%changelog