diff --git a/roundcubemail-0.6.tar.bz2 b/roundcubemail-0.6.tar.bz2
deleted file mode 100644
index 467e86d..0000000
--- a/roundcubemail-0.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d33d1416ac3403e95c6c857454e3ec43e1f459cdb27900c83d4994dd2c5c315
-size 2180273
diff --git a/roundcubemail-0.7.1.tar.gz b/roundcubemail-0.7.1.tar.gz
new file mode 100644
index 0000000..39740ea
--- /dev/null
+++ b/roundcubemail-0.7.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b3da3f85ae64a5a7513a1fbc8b5ea97ae2c39a920f9b11daa11083dc7e3c587
+size 2710511
diff --git a/roundcubemail-README.SUSE b/roundcubemail-README.SUSE
deleted file mode 100644
index 6542172..0000000
--- a/roundcubemail-README.SUSE
+++ /dev/null
@@ -1,57 +0,0 @@
-= How to set up roundcubemail for the first time =
-
-(see further below for hints on how to update an existing installation)
-
-== Step 1. Configure mysql ==
-
-First, start it:
-
- rcmysql start (upon the very first start, it is initialized)
-
-set root passwort:
-
- /usr/bin/mysqladmin -u root password 'secret'
-
-Create database named "roundcubemail" and grant a user authenticating as
-"roundcube" all permissions on it:
-
-
-# mysql -u root -p
-mysql> create database roundcubemail DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-Query OK, 1 row affected (0.02 sec)
-
-mysql> GRANT ALL PRIVILEGES ON roundcubemail.* TO roundcube@localhost IDENTIFIED BY 'otherpassword';
-Query OK, 0 rows affected (0.02 sec)
-
-mysql> quit
- Bye
-
-
-initialize roundcubemail database:
-
-# mysql roundcubemail < /usr/share/doc/packages/roundcubemail/SQL/mysql5.initial.sql
-
-
-== Step 2. Configure roundcubemail ==
-
-Edit __ROUNDCUBEPATH__/config/db.inc.php to contain the right password and username for accessing the
-mysql database. See $rcmail_config['db_dsnw'] line.
-
-Change the fie __ROUNDCUBEPATH__/config/main.inc.php according your to environment and your needs.
-
-== Step 2b. Adapt apache configuration ==
-
-Edit __HTTPCONFDIR__/roundcubemail.conf if needed. The default sould be ok.
-
-== Step 3. Enyoi ==
-
-Start apache2, open the URL:
- http://localhost/roundcube
-
-in a browser and login with a username and password recognised by your imap server.
-
-= Upgrading from previous versions =
-
-If you already have a previous version of RoundCube installed,
-please refer to the instructions in UPGRADING guide.
-
diff --git a/roundcubemail-httpd.conf b/roundcubemail-httpd.conf
index 9474631..e5131ab 100644
--- a/roundcubemail-httpd.conf
+++ b/roundcubemail-httpd.conf
@@ -7,50 +7,106 @@
# ServerName your.server.name
# DocumentRoot /srv/www/roundcubemail
+
- Alias /roundcube __ROUNDCUBEPATH__
+ Alias /roundcube __ROUNDCUBEPATH__
+# AddDefaultCharset UTF-8
+AddType text/x-component .htc
-
- # remove the next line to get real UTF-8 support
- # AddDefaultCharset UTF-8
- php_admin_flag display_errors Off
- php_admin_flag log_errors On
- 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__:/etc/roundcubemail:/tmp"
-
-
-
- Order allow,deny
- Deny from all
-
- Order deny,allow
- Allow from all
-
+
+ Order allow,deny
+ Allow from 127.0.0.1
+ #Allow from all
+
+ Options -Indexes FollowSymLinks
+
+
+ php_flag display_errors Off
+ php_flag log_errors On
+ # php_value error_log logs/errors
+
+ php_value upload_max_filesize 5M
+ php_value post_max_size 6M
+ php_value memory_limit 64M
+
+ php_flag zlib.output_compression Off
+ php_flag magic_quotes_gpc Off
+ php_flag magic_quotes_runtime Off
+ php_flag zend.ze1_compatibility_mode Off
+ php_flag suhosin.session.encrypt Off
+
+ #php_value session.cookie_path /
+ php_flag session.auto_start Off
+ php_value session.gc_maxlifetime 21600
+ php_value session.gc_divisor 500
+ php_value session.gc_probability 1
+
+ # http://bugs.php.net/bug.php?id=30766
+ php_value mbstring.func_overload 0
+
+
+
+ RewriteEngine On
+ RewriteRule ^favicon.ico$ skins/default/images/favicon.ico
+ # security rules
+ RewriteRule .svn/ - [F]
+ RewriteRule ^README|INSTALL|LICENSE|SQL|bin|CHANGELOG$ - [F]
+
+
+
+ SetOutputFilter DEFLATE
+
+
+
+ # replace 'append' with 'merge' for Apache version 2.2.9 and later
+ #Header append Cache-Control public env=!NO_CACHE
+
+
+
+ ExpiresActive On
+ ExpiresDefault "access plus 1 month"
+
+
+ FileETag MTime Size
+
+
+
+ # Special directories
- Order allow,deny
- Deny from all
+ Order allow,deny
+ Deny from all
+
+
+
+
+ RewriteEngine On
+ RewriteRule !^js|.*\.gif$ - [F]
+
- Order allow,deny
- Deny from all
+ Order allow,deny
+ Deny from all
- Order allow,deny
- Deny from all
+ Order allow,deny
+ Deny from all
- Order allow,deny
- Deny from all
+ Order allow,deny
+ Deny from all
-
+
+
+ Order allow,deny
+ Deny from all
+
+
#
diff --git a/roundcubemail-rpmlintrc b/roundcubemail-rpmlintrc
index dad3275..318a5f2 100644
--- a/roundcubemail-rpmlintrc
+++ b/roundcubemail-rpmlintrc
@@ -1,15 +1,6 @@
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 /srv/www/roundcubemail/plugins/new_user_dialog/localization/pt_BR.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")
diff --git a/roundcubemail.changes b/roundcubemail.changes
index e8850ff..c7372ea 100644
--- a/roundcubemail.changes
+++ b/roundcubemail.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Feb 12 12:17:08 UTC 2012 - wr@rosenauer.org
+
+- Update to version 0.7.1
+ * lot of bugfixes and improvements (see CHANGELOG)
+ * reworked and completed Apache config
+- moved SQL directory from docdir to application
+ (to make the installer work)
+- use fdupes
+- removed README.SUSE as the upstream INSTALL document is equally
+ useful already and describes using the delivered installer
+
-------------------------------------------------------------------
Fri Sep 30 15:07:28 CEST 2011 - asemen@suse.de
diff --git a/roundcubemail.spec b/roundcubemail.spec
index d516910..f103b6b 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
#
# spec file for package roundcubemail
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,23 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: roundcubemail
Summary: A modern browser-based multilingual IMAP client
+License: GPL-2.0 ; BSD-3-Clause
Group: Productivity/Networking/Email/Clients
-License: GNU General Public License (GPL)
Url: http://www.roundcube.net/
-Version: 0.6
+Version: 0.7.1
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
+BuildRequires: apache2-devel
+BuildRequires: fdupes
+BuildRequires: pcre-devel
+Requires: http_daemon mod_php_any php-session php_any_db php-iconv
+Requires: php-gettext php-mbstring php-openssl php-mcrypt
+Recommends: php-mysql
## Requires: for upstream dep package
-Requires: php5-mcrypt php5-intl php5-pear-Auth_SASL
-Source0: %{name}-%{version}.tar.bz2
-Source1: %{name}-README.SUSE
+#Requires: php5-intl php5-pear-Auth_SASL
+Source0: %{name}-%{version}.tar.gz
Source2: %{name}-httpd.conf
Source3: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE use the general config directory /etc
@@ -60,55 +60,62 @@ The user interface is fully skinnable using XHTML and CSS 2.
%build
%install
-install -d -m 0755 %buildroot/%roundcubepath
-cp -a * %buildroot/%{roundcubepath}/
+install -d -m 0755 %buildroot%roundcubepath
+cp -a * %buildroot%{roundcubepath}/
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
+rm %{buildroot}%{roundcubeconfigpath}/*.dist
+rm -rf %buildroot%{roundcubepath}/config
# install httpd.conf file and adapt the configuration
install -d -m 0755 %buildroot/%{apache_sysconfdir}/conf.d
-sed -e "s#__ROUNDCUBEPATH__#%{roundcubepath}#g" %{SOURCE2} > %buildroot/%{apache_sysconfdir}/conf.d/roundcubemail.conf
+sed -e "s#__ROUNDCUBEPATH__#%{roundcubepath}#g" %{SOURCE2} > %buildroot%{apache_sysconfdir}/conf.d/roundcubemail.conf
-# install docs (SQL directory should not be needed during runtime - move it as well
-install -d -m 0755 %buildroot/%_defaultdocdir/%name
-for i in CHANGELOG INSTALL UPGRADING LICENSE README SQL; do
- mv -v %buildroot/%roundcubepath/$i %buildroot/%_defaultdocdir/%name/
+# install docs
+install -d -m 0755 %buildroot%_defaultdocdir/%name
+for i in CHANGELOG INSTALL UPGRADING LICENSE README ; do
+ mv -v %{buildroot}%{roundcubepath}/$i %{buildroot}%{_defaultdocdir}/%name/
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
find %buildroot/%{roundcubepath} -name .htaccess -delete
-# fix wrong end of line encoding
-# FIXME this breaks some PNGs!
-#for file in $(find %buildroot/%{roundcubepath} -type f); do
-# sed -i 's/\x0D$//' $file
-#done
+
+# fdupes
+%fdupes %{buildroot}%{roundcubepath}
%clean
rm -rf %buildroot
+%post
+# enable apache required apache modules
+if [ -x /usr/sbin/a2enmod ]
+then
+ a2enmod -q alias || a2enmod alias
+ a2enmod -q rewrite || a2enmod rewrite
+fi
+
%files
%defattr(0644, root, root,0755)
%doc %_defaultdocdir/%name/
%dir %{roundcubepath}
%dir %{roundcubeconfigpath}
-%{roundcubeconfigpath}/*.dist
%config(noreplace) %{roundcubeconfigpath}/db.inc.php
%config(noreplace) %{roundcubeconfigpath}/main.inc.php
-%config(noreplace) %{roundcubeconfigpath}/mimetypes.php
+%config %{roundcubeconfigpath}/*
+%config %{roundcubeconfigpath}/mimetypes.php
%config(noreplace) %{apache_sysconfdir}/conf.d/roundcubemail.conf
%{roundcubepath}/index.php
%{roundcubepath}/robots.txt
%attr(0755,root,root) %{roundcubepath}/bin/*.sh
%dir %{roundcubepath}/bin
%{roundcubepath}/installer/
-%{roundcubepath}/logs/
%{roundcubepath}/plugins/
%{roundcubepath}/program/
%{roundcubepath}/skins/
+%{roundcubepath}/SQL
+%attr(-, wwwrun, root) %{roundcubepath}/logs/
%attr(-, wwwrun, root) %{roundcubepath}/temp/
%changelog