diff options
| -rw-r--r-- | roundcubemail-0.4.1-confpath.patch | 12 | ||||
| -rw-r--r-- | roundcubemail-0.8.1-strict.patch | 11 | ||||
| -rw-r--r-- | roundcubemail-0.9.0-confpath.patch | 23 | ||||
| -rw-r--r-- | roundcubemail-README.fedora | 52 | ||||
| -rw-r--r-- | roundcubemail.spec | 44 |
5 files changed, 84 insertions, 58 deletions
diff --git a/roundcubemail-0.4.1-confpath.patch b/roundcubemail-0.4.1-confpath.patch deleted file mode 100644 index 7311f96..0000000 --- a/roundcubemail-0.4.1-confpath.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- program/include/iniset.php~ 2010-09-29 05:04:09.000000000 -0500 -+++ program/include/iniset.php 2010-10-04 08:29:02.687967293 -0500 -@@ -46,7 +46,8 @@ - } - - if (!defined('RCMAIL_CONFIG_DIR')) { -- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); -+ #define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); -+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); - } - - // make sure path_separator is defined diff --git a/roundcubemail-0.8.1-strict.patch b/roundcubemail-0.8.1-strict.patch deleted file mode 100644 index cb9ddd1..0000000 --- a/roundcubemail-0.8.1-strict.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- program/include/iniset.php~ 2012-08-20 10:19:53.000000000 -0500 -+++ program/include/iniset.php 2012-08-20 10:22:57.372357067 -0500 -@@ -24,7 +24,7 @@ - */ - - $config = array( -- 'error_reporting' => E_ALL &~ (E_NOTICE | E_STRICT), -+ 'error_reporting' => E_ALL & ~E_NOTICE & ~E_STRICT, - // Some users are not using Installer, so we'll check some - // critical PHP settings here. Only these, which doesn't provide - // an error/warning in the logs later. See (#1486307). diff --git a/roundcubemail-0.9.0-confpath.patch b/roundcubemail-0.9.0-confpath.patch new file mode 100644 index 0000000..d86a26d --- /dev/null +++ b/roundcubemail-0.9.0-confpath.patch @@ -0,0 +1,23 @@ +--- roundcubemail-0.9.0-dep/program/include/iniset.php 2013-04-15 13:43:00.000000000 -0700 ++++ roundcubemail-0.9.0-dep/program/include/iniset.php.new 2013-05-01 16:59:49.434415736 -0700 +@@ -44,7 +44,8 @@ + } + + if (!defined('RCMAIL_CONFIG_DIR')) { +- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); ++# define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config'); ++ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail'); + } + + if (!defined('RCUBE_LOCALIZATION_DIR')) { +--- roundcubemail-0.9.0-dep/program/lib/Roundcube/bootstrap.php 2013-04-15 13:43:01.000000000 -0700 ++++ roundcubemail-0.9.0-dep/program/lib/Roundcube/bootstrap.php.new 2013-05-01 17:13:34.657216045 -0700 +@@ -64,7 +64,7 @@ + } + + if (!defined('RCUBE_CONFIG_DIR')) { +- define('RCUBE_CONFIG_DIR', RCUBE_INSTALL_PATH . 'config/'); ++ define('RCUBE_CONFIG_DIR', '/etc/roundcubemail'); + } + + if (!defined('RCUBE_PLUGINS_DIR')) { 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 5bd0a41..904cc98 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,9 +12,9 @@ Source0: http://downloads.sourceforge.net/roundcubemail/roundcubemail-%{version} Source1: roundcubemail.conf Source2: roundcubemail.logrotate Source4: roundcubemail-README.fedora -# Non-upstremable: Adjusts config path to Fedora policy -Patch6: roundcubemail-0.4.1-confpath.patch -Patch7: roundcubemail-0.8.1-strict.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) @@ -32,8 +32,10 @@ Requires: php-json Requires: php-ldap Requires: php-mbstring Requires: php-mcrypt +Requires: php-mysql Requires: php-pcre Requires: php-posix +Requires: php-pdo Requires: php-pspell Requires: php-session Requires: php-simplexml @@ -41,13 +43,10 @@ Requires: php-sockets Requires: php-spl Requires: php-xml Requires: php-pear(Auth_SASL) -Requires: php-pear(DB) Requires: php-pear(Mail_Mime) Requires: php-pear(Net_SMTP) Requires: php-pear(Net_Socket) Requires: php-pear(Mail_mimeDecode) -Requires: php-pear(MDB2) >= 2.5.0 -Requires: php-pear(MDB2_Driver_mysql) Requires: php-pear(Net_IDNA2) %description @@ -56,14 +55,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 - -%patch6 -p0 -%patch7 -p0 +%patch6 -p1 # fix permissions and remove any .htaccess files find . -type f -print | xargs chmod a-x @@ -73,12 +71,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 @@ -96,7 +90,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 @@ -155,6 +151,20 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail %changelog +* Sat May 4 2013 Remi Collet <remi@fedoraproject.org> - 0.9.0-1 +- backport 0.9.0 for remi repo in sync with rawhide + +* Wed May 01 2013 Adam Williamson <awilliam@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 Remi Collet <remi@fedoraproject.org> - 0.8.6-1 - backport 0.8.6 for remi repo |