summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-10-29 18:03:06 +0100
committerRemi Collet <fedora@famillecollet.com>2012-10-29 18:03:06 +0100
commit69b7c6c33e459a08a30979e9b0871c27ea8143b3 (patch)
treee5a4c3aed2773de957279d9cdf18a92dc597c60f
parent879f655185c6795f42638a52472a4e955a19d050 (diff)
roundcubemail: fix configuration for httpd 2.4 (#871123)
-rw-r--r--roundcubemail.spec13
1 files changed, 9 insertions, 4 deletions
diff --git a/roundcubemail.spec b/roundcubemail.spec
index e2eec9e..8ea84db 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -2,7 +2,7 @@
%global _logdir /var/log
Name: roundcubemail
Version: 0.8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Round Cube Webmail is a browser-based multilingual IMAP client
Group: Applications/System
@@ -12,11 +12,12 @@ 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
-# https://bugzilla.redhat.com/870933
-Patch8: roundcubemail-0.8.2-mdb2.patch
+#Patch8: roundcubemail-0.7.3-xss-sig.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -47,9 +48,10 @@ interface is fully skinnable using XHTML and CSS 2.
%prep
%setup -q -n roundcubemail-%{version}-dep
+%patch1 -p1
%patch6 -p0
%patch7 -p0
-%patch8 -p1
+#%patch8 -p0
# fix permissions and remove any .htaccess files
find . -type f -print | xargs chmod a-x
@@ -141,6 +143,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
%changelog
+* Mon Oct 29 2012 Remi Collet <remi@fedoraproject.org> - 0.8.2-3
+- fix configuration for httpd 2.4 (#871123)
+
* Sun Oct 28 2012 Remi Collet <remi@fedoraproject.org> - 0.8.2-2
- add fix for latest MDB2 (#870933)