[libreoffice/f19] new upstream release 4.1.6
David Tardon
dtardon at fedoraproject.org
Tue Apr 29 19:14:59 UTC 2014
commit fb5565a508d0f40fcc06ee1c0eb47633628cef8a
Author: David Tardon <dtardon at redhat.com>
Date: Tue Apr 29 18:15:52 2014 +0200
new upstream release 4.1.6
.gitignore | 3 +
...z-1076264-intermittent-a11y-crash-in-calc.patch | 212 ------------
...bz-1007697-Update-on-a-Window-triggering-.patch | 168 ----------
...bz-1065807-use-xdg-Templates-for-default-.patch | 18 +-
...list-common-lang-independant-template-dir.patch | 22 --
...ix-for-Different_Odd_And_Even_Pages-flag-.patch | 316 ------------------
...9-RTF-import-don-t-drop-nested-cells-if-n.patch | 227 -------------
...-DOCX-import-fix-context-stack-when-impor.patch | 341 --------------------
libreoffice.spec | 15 +-
sources | 6 +-
10 files changed, 21 insertions(+), 1307 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d5d1dc..bfb2fdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,6 @@
/libreoffice-4.1.5.3.tar.xz
/libreoffice-help-4.1.5.3.tar.xz
/libreoffice-translations-4.1.5.3.tar.xz
+/libreoffice-4.1.6.2.tar.xz
+/libreoffice-help-4.1.6.2.tar.xz
+/libreoffice-translations-4.1.6.2.tar.xz
diff --git a/0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch b/0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch
index 8ba57de..b0b0b53 100644
--- a/0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch
+++ b/0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch
@@ -1,7 +1,7 @@
-From c309eed705edd358ba2db8b26d711d0f8ae41dca Mon Sep 17 00:00:00 2001
+From c4fde89d031185be6f12202fab81b7c541e9db5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Mon, 24 Feb 2014 11:38:13 +0000
-Subject: [PATCH 3/4] Resolves: rhbz#1065807 use xdg ~/Templates for default
+Subject: [PATCH] Resolves: rhbz#1065807 use xdg ~/Templates for default
Template location
(if it exists)
@@ -16,10 +16,10 @@ Change-Id: I98fc9fd54d1f56c8bed24ce4d2ebf53756ded2cc
5 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
-index 15fb3c0..bdb2949 100644
+index b2e2dd0..48a60b3 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
-@@ -280,6 +280,12 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath)
+@@ -296,6 +296,12 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath)
// read the writeable path
xPath->getByName(CFGPROP_WRITEPATH) >>= aPathVal.sWritePath;
@@ -33,11 +33,11 @@ index 15fb3c0..bdb2949 100644
xPath->getByName(CFGPROP_ISSINGLEPATH) >>= aPathVal.bIsSinglePath;
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
-index 4b5ec7d..2ef605e 100644
+index 9384200..c7794ea 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
-@@ -160,8 +160,21 @@
- <node oor:name="InternalPaths">
+@@ -161,8 +161,21 @@
+ <node oor:name="$(insturl)/share/template/common" oor:op="fuse"/>
<node oor:name="$(insturl)/share/template/$(vlang)" oor:op="fuse"/>
</node>
+ <!--
@@ -91,7 +91,7 @@ index 3e8e8c1..52d8358 100644
return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
}
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
-index de8eb29..0d407d6 100644
+index d1b4b0d..ab0f3e3 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -23,6 +23,7 @@
@@ -194,5 +194,5 @@ index 7f0a52a..3fcd217 100644
SETTING_SOURCEVIEWFONT_HEIGHT,
SETTING_USER_GIVENNAME,
--
-1.8.5.3
+1.9.0
diff --git a/libreoffice.spec b/libreoffice.spec
index e452dd1..7991dd4 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%define libo_version 4.1.5
+%define libo_version 4.1.6
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@@ -41,8 +41,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: %{libo_version}.3
-Release: 7%{?libo_prerelease}%{?dist}
+Version: %{libo_version}.2
+Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
Group: Applications/Productivity
URL: http://www.libreoffice.org/default/
@@ -270,19 +270,13 @@ Patch29: 0001-Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch
Patch30: 0001-Resolves-rhbz-1010995-div-by-0-on-some-bizarre-corne.patch
Patch31: 0001-Related-rhbz-1065807-rework-i66157-for-multiple-writ.patch
Patch32: 0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch
-Patch33: 0001-explictly-list-common-lang-independant-template-dir.patch
Patch34: 0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch
Patch35: 0001-KDE-don-t-throw-on-TemplatePathVariable.patch
-Patch36: 0001-Resolves-rhbz-1007697-Update-on-a-Window-triggering-.patch
Patch37: 0001-Wizards-should-look-for-templates-in-Template_intern.patch
Patch38: 0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
Patch39: 0001-never-run-autogen.sh.patch
-Patch40: 0001-rhbz-988516-DOCX-import-fix-context-stack-when-impor.patch
-Patch41: 0001-fdo-65655-fix-for-Different_Odd_And_Even_Pages-flag-.patch
-Patch42: 0001-rhbz-1065629-RTF-import-don-t-drop-nested-cells-if-n.patch
Patch43: 0002-rhbz-1065629-RTF-import-re-implement-nested-tables.patch
Patch44: 0003-writerfilter-salvage-a-field-parameter-parsing-train.patch
-Patch45: 0001-Related-rhbz-1076264-intermittent-a11y-crash-in-calc.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@@ -2155,6 +2149,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Tue Apr 29 2014 David Tardon <dtardon at redhat.com> - 1:4.1.6.2-1
+- new upstream release
+
* Sat Mar 15 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.1.5.3-7
- Related: rhbz#1076264 intermittent a11y crash in calc
diff --git a/sources b/sources
index 7c71a56..d496b30 100644
--- a/sources
+++ b/sources
@@ -6,6 +6,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
-12679026121300396c85b4ca11b176c7 libreoffice-4.1.5.3.tar.xz
-e0ea06a105071c278e52866f476c0ee6 libreoffice-help-4.1.5.3.tar.xz
-c3b03c33ee14628f1c151288f2eb4962 libreoffice-translations-4.1.5.3.tar.xz
+899137bd1ae0ff5e79d769fb326c24f0 libreoffice-4.1.6.2.tar.xz
+2d02d0e86edf64579e5f2d44912fd3be libreoffice-help-4.1.6.2.tar.xz
+152866fe2b875746112ea264125979ad libreoffice-translations-4.1.6.2.tar.xz
More information about the scm-commits
mailing list