diff --git a/0001-fdo-52022-Simple-LargeControlPoints-actually-can-hav.patch b/0001-fdo-52022-Simple-LargeControlPoints-actually-can-hav.patch new file mode 100644 index 0000000..f5b9ecb --- /dev/null +++ b/0001-fdo-52022-Simple-LargeControlPoints-actually-can-hav.patch @@ -0,0 +1,87 @@ +From c646b900c72cd85b8476b49249b29f955ab07a09 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Thu, 4 Oct 2012 22:46:10 +0200 +Subject: [PATCH] fdo#52022: Simple/LargeControlPoints actually can have nil + values + +...in old LO 3.5 registrymodifications.xcu, which causes trouble when migrating +to >= LO 3.6, see for +all the details. + +Change-Id: I8fa1e67998c9588b9d8bf3a3b52e4b0684d3d705 +(cherry picked from commit a51833bf79eed21a7cddd6da45dc9d3dc07b4983) +--- + officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 4 ++-- + officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 4 ++-- + officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +index 0f5898e..55ee57a 100644 +--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs ++++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +@@ -340,7 +340,7 @@ + + false + +- ++ + + + +@@ -351,7 +351,7 @@ + + false + +- ++ + + + +diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +index e797988..8865f74 100644 +--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs ++++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +@@ -1306,7 +1306,7 @@ + + false + +- ++ + + + +@@ -1317,7 +1317,7 @@ + + false + +- ++ + + + +diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +index 79f581a..6b99869 100644 +--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs ++++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +@@ -210,7 +210,7 @@ + + false + +- ++ + + + +@@ -221,7 +221,7 @@ + + false + +- ++ + + + +-- +1.7.11.4 + diff --git a/libreoffice.spec b/libreoffice.spec index 78e1bdf..9e07917 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -34,7 +34,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?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 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -172,6 +172,7 @@ Patch11: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch Patch13: 0001-Resolves-rhbz-842292-crash-in-calling-callback-whose.patch Patch14: 0001-Resolves-rhbz-855972-crash-on-switching-to-outline-v.patch Patch15: 0001-Resolves-rhbz-855541-XIOError-handler-multithread-wo.patch +Patch16: 0001-fdo-52022-Simple-LargeControlPoints-actually-can-hav.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -783,6 +784,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch13 -p1 -b .rhbz-842292-crash-in-calling-callback-whose.patch %patch14 -p1 -b .rhbz-855972-crash-on-switching-to-outline-v.patch %patch15 -p1 -b .rhbz-855541-XIOError-handler-multithread-wo.patch +%patch16 -p1 -b .fdo-52022-Simple-LargeControlPoints-actually-can-hav.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2013,6 +2015,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Fri Oct 05 2012 Stephan Bergmann - 1:3.6.2.2-2 +- Resolves: fdo#52022 Part of data in userdir is lost on upgrade + * Wed Sep 26 2012 David Tardon - 1:3.6.2.2-1 - 3.6.2 rc2