From e708f027e55d6202636e05175a88507c08131ba1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 24 Aug 2013 08:39:39 +0200 Subject: roundcubemail: sync with rawhide --- roundcubemail.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'roundcubemail.spec') diff --git a/roundcubemail.spec b/roundcubemail.spec index 28a90e7..9bb7c04 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -2,7 +2,7 @@ %global _logdir /var/log Name: roundcubemail Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client Group: Applications/System @@ -23,6 +23,9 @@ Source0: http://downloads.sourceforge.net/roundcubemail/roundcubemail-%{version} Source1: roundcubemail.conf Source2: roundcubemail.logrotate Source4: roundcubemail-README.fedora +# Elegantly handle removal of moxieplayer Flash binary in tinymce +# media plugin (see "Drop precompiled flash" in %pre) +Patch0: roundcubemail-0.9.3-no_swf.patch # Non-upstreamable: Adjusts config path to Fedora policy Patch6: roundcubemail-0.9.0-confpath.patch @@ -72,6 +75,7 @@ CSS 2. %prep %setup -q -n roundcubemail-%{version}-dep +%patch0 -p1 %patch6 -p1 # fix permissions and remove any .htaccess files @@ -86,11 +90,11 @@ sed -i 's|logs/|%{_logdir}/roundcubemail/|' config/main.inc.php.dist # ??? - Jon, this could do with a comment; fixing carriage returns? (adamw) sed -i 's/\r//' SQL/mssql.initial.sql -%build - #Drop precompiled flash find . -type f -name '*.swf' | xargs rm -f +%build + %install rm -rf %{buildroot} @@ -165,6 +169,12 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail %changelog +* Sat Aug 24 2013 Remi Collet - 0.9.3-2 +- sync with rawhide for remi repo + +* Fri Aug 23 2013 Adam Williamson - 0.9.3-2 +- patch tinymce to cope elegantly with Flash binary being removed + * Fri Aug 23 2013 Remi Collet - 0.9.3-1 - backport 0.9.3 for remi repo in sync with rawhide -- cgit