--- cauldron/roundcubemail/current/SPECS/roundcubemail.spec	2011/12/29 18:00:49	188734
+++ cauldron/roundcubemail/current/SPECS/roundcubemail.spec	2011/12/29 18:08:51	188735
@@ -1,4 +1,4 @@
-%define rel		1
+%define rel		2
 %define beta		0
 %if %beta
 %define	release		%mkrel 0.%beta.%rel
@@ -21,6 +21,7 @@
 # - AdamW 2007/07
 URL:		http://www.roundcube.net/
 Source0:	http://downloads.sourceforge.net/roundcubemail/%{distname}
+Source1:	README.urpmi
 Epoch:		1
 #BuildRequires:	apache-devel pcre-devel rpm-helper
 Requires:	apache-mod_php
@@ -56,6 +57,10 @@
 Webmail is written in PHP and requires a MySQL or PostgreSQL database.
 The user interface is fully skinnable using XHTML and CSS 2.
 
+If upgading an existing installation, please read instructions under
+%{docdir}/README.urpmi for upgrading your MySQL/PostgreSQL/SQLite
+database.
+
 %prep
 %setup -q -n %{dirname}
 
@@ -90,32 +95,8 @@
 rm -f CHANGELOG INSTALL UPGRADING LICENSE README
 popd
 
-
-cat <<EOF > README.urpmi
-
-It therefore differs from a standard installation in the following
-ways:
-
-* Logs are stored to /var/log/roundcubemail
-* Temporary files are placed in /tmp
-* Configuration files (main.inc.php and db.inc.php) are placed in
-  /etc/roundcubemail
-
-You will need to edit /etc/roundcubemail/main.inc.php and
-/etc/roundcubemail/db.inc.php appropriately for your site before you
-can use Roundcube. You must at least configure an appropriate mail
-server and port in main.inc.php, and change the 
-$rcmail_config['des_key'] setting. In db.inc.php you must configure
-an appropriate database location and user; in the most simple
-configuration, you would create a new user and database both named
-'roundcubemail' on a MySQL server running on the same machine, give
-the roundcubemail user full read/write access to the roundcubemail
-database, and set db.inc.php appropriately. Roundcubemail ships with
-an installer which can help you do all this, but it is disabled by
-default for security reasons. You can enable it in main.inc.php by
-setting the 'enable_installer' variable to 'true'. Then browse to
-http://server/roundcubemail/installer to use the installer.
-EOF
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
+install -p %{SOURCE1} %{buildroot}%{_defaultdocdir}/%{name}/README.urpmi
 
 mkdir -p %{buildroot}%{_webappconfdir}
 cat > %{buildroot}%{_webappconfdir}/%{name}.conf <<EOF
@@ -134,11 +115,8 @@
 php_value suhosin.session.encrypt Off
 EOF
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%doc CHANGELOG README README.urpmi UPGRADING
+%doc CHANGELOG README UPGRADING
 %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %{_logdir}/%{name}