Hello community,

here is the log from the commit of package libreoffice for openSUSE:Factory 
checked in at 2016-11-22 18:57:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
 and      /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libreoffice"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes  2016-11-09 
11:38:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes     
2016-11-22 18:57:01.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 21 07:56:22 UTC 2016 - tchva...@suse.com
+
+- Introduce back scp2-user-config-suse.diff wrt bnc#1010654 as
+  otherwise user configs would disappear with maintenance update...
+
+-------------------------------------------------------------------

New:
----
  scp2-user-config-suse.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.WwvKKM/_old  2016-11-22 18:57:08.000000000 +0100
+++ /var/tmp/diff_new_pack.WwvKKM/_new  2016-11-22 18:57:08.000000000 +0100
@@ -63,6 +63,9 @@
 Source2005:     
%{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # PATCH-FIX-SUSE: disable really fragile test run on hsqldb
 Patch0:         disable-flaky-hsqldb-test.patch
+# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
+# to avoid BerkleyDB incompatibility with the plain build
+Patch1:         scp2-user-config-suse.diff
 # correctly bootstrap python stuff with system python (deb#501028, bnc#90701)
 Patch3:         system-pyuno.diff
 # do not use the broken help; unopkg complained about it when registering 
extensions
@@ -924,6 +927,10 @@
 %prep
 %setup -q -b1 -b2
 %patch0 -p1
+# The rename of the configdir is needed only on older than factory for compat
+%if 0%{?suse_version} < 1330
+%patch1
+%endif
 %patch3 -p1
 %patch4
 %patch5







++++++ scp2-user-config-suse.diff ++++++
---
 officecfg/registry/data/org/openoffice/Setup.xcu |    2 +-
 scp2/source/ooo/common_brand.scp                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git officecfg/registry/data/org/openoffice/Setup.xcu 
officecfg/registry/data/org/openoffice/Setup.xcu
index 8e18ca5..7c0b95d 100644
--- officecfg/registry/data/org/openoffice/Setup.xcu
+++ officecfg/registry/data/org/openoffice/Setup.xcu
@@ -788,7 +788,7 @@
           <value>10</value>
         </prop>
         <prop oor:name="VersionIdentifiers">
-          <value oor:separator=",">Libreoffice 3=libreoffice/3,Openofice.org 
3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 
8=staroffice8,StarSuite 8=starsuite8</value>
+          <value oor:separator=",">Libreoffice 
3=libreoffice/3-suse,Openofice.org 3=ooo3,OpenOffice.org 2=ooo-2.0,StarOffice 
8=staroffice8,StarSuite 8=starsuite8</value>
         </prop>
         <node oor:name="MigrationSteps">
           <node oor:name="Datasources" oor:op="replace">
diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
index 7bbf873..0b235a0 100644
--- scp2/source/ooo/common_brand.scp
+++ scp2/source/ooo/common_brand.scp
@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
   #elif defined MACOSX
     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #else
-    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION-suse";
   #endif
 End
 
-- 
1.7.0.1


Reply via email to