[roundcubemail] new upstream release, adjust deps, patches and docs for upstream changes
Adam Williamson
adamwill at fedoraproject.org
Thu May 2 01:08:48 UTC 2013
commit 97516b2a1370d2c4c229be3fd169f266d4f5cdb4
Author: Adam Williamson <awilliam at redhat.com>
Date: Wed May 1 18:08:07 2013 -0700
new upstream release, adjust deps, patches and docs for upstream changes
.gitignore | 1 +
roundcubemail-0.4.1-confpath.patch | 12 ----
roundcubemail-0.7.1-strict.patch | 11 ----
roundcubemail-0.7.2-strict.patch | 11 ----
roundcubemail-0.7.3-xss-sig.patch | 103 ------------------------------------
roundcubemail-0.8.1-strict.patch | 11 ----
roundcubemail-0.8.2-mdb2.patch | 34 ------------
roundcubemail-README.fedora | 52 ++++++++++++------
roundcubemail-generate-tarball.sh | 11 ----
roundcubemail.spec | 58 ++++++++++----------
sources | 2 +-
11 files changed, 66 insertions(+), 240 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de8aa70..3359f33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ roundcubemail-0.3.1-dep.tar.gz
/roundcubemail-0.8.4-dep.tar.gz
/roundcubemail-0.8.5-dep.tar.gz
/roundcubemail-0.8.6-dep.tar.gz
+/roundcubemail-0.9.0-dep.tar.gz
diff --git a/roundcubemail-README.fedora b/roundcubemail-README.fedora
index daefc43..667d495 100644
--- a/roundcubemail-README.fedora
+++ b/roundcubemail-README.fedora
@@ -1,24 +1,40 @@
Regarding database availability:
-In addition to MySQL and PostgreSQL, upstream Roundcubemail includes support
-for SQLite. This has been disabled in the Fedora version (for the time being)
-because Roundcube requires the SQLite2-compatible mainline PHP SQLite extension.
-This extension is unavailable in Fedora in favor of the SQLite3-compatible PDO
-SQLite extension (php-pdo package). For this reason, we have disabled SQLite
-support in Roundcube. If upstream releases a new version that supports the
-PDO extension, or if SQLite2 support for PHP becomes available in Fedora, we
-will re-enable SQLite support in Roundcubemail.
+Prior to version 0.9.0, SQLite support was disabled in the Fedora package
+because Roundcube required the SQLite2-compatible mainline PHP SQLite extension.
+As of version 0.9.0, upstream Roundcube has switched to the PDO extension for
+database support, and so SQLite support has been re-enabled in the Fedora
+package.
-Jon Ciesla
-05/11/2007
+Jon Ciesla, Adam Williamson
+2013-05-01
-Additional installation information:
+Additional installation and update information:
-In your installation process, you'll need to modify db.inc.php and main.inc.php.
-In Fedora, these are located in /etc/roundcubemail. These will work in this location,
-and should not be moved. They will not be modified at upgrade, so you may want to
-check the .rpmnew files at that time so see if you need to migrate your settings to
-the new file.
+In your installation process, you'll need to modify db.inc.php and
+main.inc.php. In Fedora, these are located in /etc/roundcubemail. These will
+work in this location, and should not be moved. They will not be modified on
+package updates, so you may want to check the .rpmnew files at that time to see
+if you need to migrate your settings to the new file. Also, you should apply
+changes to the database schema at this time. Each time upstream Roundcube
+changes the database schema, they provide the appropriate commands in a .sql
+file in /usr/share/doc/roundcubemail-0.9.0/SQL/(database) - there is one
+directory each for MySQL, PostgreSQL and SQLite. The filenames reflect the date
+on which the changes in that file were made upstream, and a comment in each
+file notes which versions it applies to. So when Roundcube is updated, check
+the appropriate directory for your database provider, and apply the appropriate
+changes to your database. There is a PHP script that attempts to aid you with
+this process located at /usr/share/roundcubemail/bin/updatedb.sh which you can
+call if you can work out the necessary parameters.
-Jon Ciesla
-10/20/2009
+The Roundcube installer is not included in the Fedora package, as its method of
+operation is not compatible with distribution packaging. As a consequence of
+this, the /usr/share/roundcubemail/bin/update.sh script which upstream
+documentation advises you to run on updates is not present in the Fedora
+package: it depends on the installer framework. All this script does is to
+check for configuration file and database schema updates as described above,
+and walk you through applying them; so long as you follow the steps outlined
+here on updates, you should be fine.
+
+Jon Ciesla, Adam Williamson
+2013-05-01
diff --git a/roundcubemail.spec b/roundcubemail.spec
index cd3f93a..66788b9 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
%define roundcubedir %{_datadir}/roundcubemail
%global _logdir /var/log
Name: roundcubemail
-Version: 0.8.6
+Version: 0.9.0
Release: 1%{?dist}
Summary: Round Cube Webmail is a browser-based multilingual IMAP client
@@ -12,29 +12,25 @@ Source0: http://downloads.sourceforge.net/roundcubemail/roundcubemail-%{version}
Source1: roundcubemail.conf
Source2: roundcubemail.logrotate
Source4: roundcubemail-README.fedora
-# https://github.com/roundcube/roundcubemail/pull/40
-#Patch1: %{name}-0.8.2-mdb2.patch
-# Non-upstremable: Adjusts config path to Fedora policy
-Patch6: roundcubemail-0.4.1-confpath.patch
-Patch7: roundcubemail-0.8.1-strict.patch
-#Patch8: roundcubemail-0.7.3-xss-sig.patch
+
+# Non-upstreamable: Adjusts config path to Fedora policy
+Patch6: roundcubemail-0.9.0-confpath.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
+Requires: php, httpd
+Requires: php-fileinfo
+Requires: php-mbstring
+Requires: php-mcrypt
+Requires: php-mysql
+Requires: php-pdo
Requires: php-pear-Auth-SASL
-Requires: php-pear-DB
+Requires: php-pear-Mail-mimeDecode
Requires: php-pear-Mail-Mime
+Requires: php-pear-Net-IDNA2
Requires: php-pear-Net-SMTP
Requires: php-pear-Net-Socket
-Requires: php, httpd
-Requires: php-pear-Mail-mimeDecode
-Requires: php-mcrypt
-Requires: php-pear-MDB2 >= 2.5.0
-Requires: php-pear-MDB2-Driver-mysql
-Requires: php-fileinfo
Requires: php-xml
-Requires: php-mbstring
-Requires: php-pear-Net-IDNA2
%description
RoundCube Webmail is a browser-based multilingual IMAP client
@@ -42,16 +38,13 @@ with an application-like user interface. It provides full
functionality you expect from an e-mail client, including MIME
support, address book, folder manipulation, message searching
and spell checking. RoundCube Webmail is written in PHP and
-requires the MySQL database or the PostgreSQL database. The user
-interface is fully skinnable using XHTML and CSS 2.
+requires a database: MySQL, PostgreSQL and SQLite are known to
+work. The user interface is fully skinnable using XHTML and
+CSS 2.
%prep
%setup -q -n roundcubemail-%{version}-dep
-
-#%patch1 -p1
-%patch6 -p0
-%patch7 -p0
-#%patch8 -p0
+%patch6 -p1
# fix permissions and remove any .htaccess files
find . -type f -print | xargs chmod a-x
@@ -61,12 +54,8 @@ find . -name \.htaccess -print | xargs rm -f
sed -i 's|temp/|${_tmppath}|' config/main.inc.php.dist
sed -i 's|config/|%{_sysconfdir}/roundcubemail/|' config/main.inc.php.dist
sed -i 's|logs/|%{_logdir}/roundcubemail/|' config/main.inc.php.dist
-sed -i 's|logs/|%{_logdir}/roundcubemail/|' program/include/main.inc
-sed -i 's|config/|%{_sysconfdir}/roundcubemail/|' program/include/main.inc
-# remove any reference to sqlite in config file so people don't mistakely
-# assume it works
-sed -i '/sqlite/d' config/db.inc.php.dist
+# ??? - Jon, this could do with a comment; fixing carriage returns? (adamw)
sed -i 's/\r//' SQL/mssql.initial.sql
%build
@@ -84,7 +73,9 @@ cp -pr * %{buildroot}%{roundcubedir}
#ln -s ../../../pear/Mail %{buildroot}%{roundcubedir}/program/lib/Mail
#ln -s ../../../pear/Net %{buildroot}%{roundcubedir}/program/lib/Net
+# drop the installer and the update.sh script which depends on it
rm -rf %{buildroot}%{roundcubedir}/installer
+rm -f %{buildroot}%{roundcubedir}/bin/update.sh
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp -pr %SOURCE1 %{buildroot}%{_sysconfdir}/httpd/conf.d
@@ -143,6 +134,17 @@ exit 0
%config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
%changelog
+* Wed May 01 2013 Adam Williamson <awilliam at redhat.com> - 0.9.0-1
+- latest upstream
+- drop MDB2 dependencies, add php-pdo dependency (upstream now using
+ pdo not MDB2)
+- drop the update.sh script as it requires the installer framework we
+ don't ship
+- update the Fedora README for changes to sqlite and update process
+- drop strict.patch, upstream actually merged it years ago, just in
+ a slightly different format, and we kept dumbly diffing it
+- drop references to obsolete patches (all merged upstream long ago)
+
* Thu Mar 28 2013 Jon Ciesla <limburgher at gmail.com> - 0.8.6-1
- Latest upstream, fixes local file inclusion via web UI
- modification of certain config options.
diff --git a/sources b/sources
index e4641ec..f160d0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cc70724166b8e8af982f8e5591a8971 roundcubemail-0.8.6-dep.tar.gz
+88caf2c0bf12c875661c5e223300b405 roundcubemail-0.9.0-dep.tar.gz
More information about the scm-commits
mailing list