summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-09-30 09:48:27 +0200
committerRemi Collet <fedora@famillecollet.com>2014-09-30 09:48:27 +0200
commit916916fe917bf25f5466a1ef1f6d913711c974e6 (patch)
treefd12971bb5f2e3c71af1efb97d74db390c7e3606
parent902e3888b7e3814c0022551a32166fb52c1224a1 (diff)
update to 1.0.3
-rw-r--r--roundcubemail-1.0.3-confpath.patch (renamed from roundcubemail-1.0.0-confpath.patch)15
-rw-r--r--roundcubemail.spec7
2 files changed, 7 insertions, 15 deletions
diff --git a/roundcubemail-1.0.0-confpath.patch b/roundcubemail-1.0.3-confpath.patch
index 8256f06..3cfb386 100644
--- a/roundcubemail-1.0.0-confpath.patch
+++ b/roundcubemail-1.0.3-confpath.patch
@@ -1,7 +1,7 @@
diff -up roundcubemail-1.0.0-dep/config/defaults.inc.php.rpm roundcubemail-1.0.0-dep/config/defaults.inc.php
--- roundcubemail-1.0.0-dep/config/defaults.inc.php.rpm 2014-04-06 16:13:17.000000000 +0200
+++ roundcubemail-1.0.0-dep/config/defaults.inc.php 2014-05-08 16:30:40.712838264 +0200
-@@ -293,10 +293,10 @@ $config['user_aliases'] = false;
+@@ -309,10 +309,10 @@ $config['user_aliases'] = false;
// use this folder to store log files (must be writeable for apache user)
// This is used by the 'file' log driver.
@@ -14,7 +14,7 @@ diff -up roundcubemail-1.0.0-dep/config/defaults.inc.php.rpm roundcubemail-1.0.0
// expire files in temp_dir after 48 hours
// possible units: s, m, h, d, w
-@@ -474,7 +474,7 @@ $config['mime_magic'] = null;
+@@ -494,7 +494,7 @@ $config['mime_magic'] = null;
// This is used to derive mime-types from the filename extension or vice versa.
// Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system,
// download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
@@ -35,17 +35,6 @@ diff -up roundcubemail-1.0.0-dep/installer/index.php.rpm roundcubemail-1.0.0-dep
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
$include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
-diff -up roundcubemail-1.0.0-dep/installer/rcube_install.php.rpm roundcubemail-1.0.0-dep/installer/rcube_install.php
---- roundcubemail-1.0.0-dep/installer/rcube_install.php.rpm 2014-05-08 16:30:44.987857419 +0200
-+++ roundcubemail-1.0.0-dep/installer/rcube_install.php 2014-05-08 16:30:54.986902235 +0200
-@@ -490,7 +490,6 @@ class rcube_install
- $types = array(
- 'application/zip' => 'zip',
- 'application/x-tar' => 'tar',
-- 'application/java-archive' => 'jar',
- 'image/gif' => 'gif',
- 'image/svg+xml' => 'svg',
- );
diff -up roundcubemail-1.0.0-dep/program/include/iniset.php.rpm roundcubemail-1.0.0-dep/program/include/iniset.php
--- roundcubemail-1.0.0-dep/program/include/iniset.php.rpm 2014-04-06 16:13:17.000000000 +0200
+++ roundcubemail-1.0.0-dep/program/include/iniset.php 2014-05-08 16:30:40.712838264 +0200
diff --git a/roundcubemail.spec b/roundcubemail.spec
index ba338e4..b299b4f 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
%define roundcubedir %{_datadir}/roundcubemail
%global _logdir /var/log
Name: roundcubemail
-Version: 1.0.2
+Version: 1.0.3
Release: 1%{?dist}
Summary: Round Cube Webmail is a browser-based multilingual IMAP client
@@ -28,7 +28,7 @@ Source4: roundcubemail-README.rpm
Patch0: roundcubemail-0.9.3-no_swf.patch
# Non-upstreamable: Adjusts config path to Fedora policy
-Patch1: roundcubemail-1.0.0-confpath.patch
+Patch1: roundcubemail-1.0.3-confpath.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -176,6 +176,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Sep 30 2014 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
+- Update to 1.0.3 (service release)
+
* Tue Jul 22 2014 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
- Update to 1.0.2 (service release)
- pull README change from rawhide