From 57956e4fa7a62c1d6786c6ac863977c06e9d3ed5806eef7031121181aa1690f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sat, 19 Jan 2013 14:37:35 +0000
Subject: [PATCH 1/4] Accepting request 149228 from devel:Factory:ARM

- raise memory limits / lower parallelism for emulated/native arm builds

- raise memory limits / lower parallelism for emulated/native arm builds

- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
- removed help-ar package because it used English strings
- raise memory limits / lower parallelism for emulated/native arm builds

- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
- removed help-ar package because it used English strings
- raise memory limits / lower parallelism for emulated/native arm builds

- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
- removed help-ar package because it used English strings
- raise memory limits / lower parallelism for emulated/native arm builds

- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
- removed help-ar package because it used English strings

OBS-URL: https://build.opensuse.org/request/show/149228
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=21
---
 libreoffice-branding-upstream.spec |  2 +-
 libreoffice-help-en-US.spec        |  3 +--
 libreoffice-help-group1.changes    |  5 +++++
 libreoffice-help-group1.spec       | 10 +++++++++-
 libreoffice-help-group2.changes    |  9 +++++++--
 libreoffice-help-group2.spec       | 10 +++++++++-
 libreoffice-help-group3.changes    | 10 +++++++---
 libreoffice-help-group3.spec       | 10 +++++++++-
 libreoffice-help-group4.changes    | 10 +++++++---
 libreoffice-help-group4.spec       | 10 +++++++++-
 libreoffice-help-group5.changes    |  9 +++++++--
 libreoffice-help-group5.spec       | 10 +++++++++-
 libreoffice-help-groupX.spec.in    |  8 ++++++++
 libreoffice-icon-themes.spec       |  2 +-
 libreoffice-l10n.spec              |  6 +++---
 libreoffice.spec                   |  2 +-
 16 files changed, 93 insertions(+), 23 deletions(-)

diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec
index d9f4f41..63fab67 100644
--- a/libreoffice-branding-upstream.spec
+++ b/libreoffice-branding-upstream.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-branding-upstream
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec
index 89cea85..2226e79 100644
--- a/libreoffice-help-en-US.spec
+++ b/libreoffice-help-en-US.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-help-en-US
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -333,5 +333,4 @@ rm -f %_datadir/%lo_home/help_en_US_list.txt.postun 2>/dev/null
 %files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US
 %defattr(-,root,root)
 
-
 %changelog
diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes
index 8c6748e..fac85aa 100644
--- a/libreoffice-help-group1.changes
+++ b/libreoffice-help-group1.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
+
+- raise memory limits / lower parallelism for emulated/native arm builds
+
 -------------------------------------------------------------------
 Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
 
diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec
index 8fb5e08..034ee88 100644
--- a/libreoffice-help-group1.spec
+++ b/libreoffice-help-group1.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-help-group1
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -367,6 +367,11 @@ cd -
 BUILD_SCRIPT_FLAGS=
 # dmake does not work with more than 64 jobs
 lo_jobs="%{?jobs:%jobs}"
+%ifarch %arm
+%if ! 0%{?qemu_user_space_build:1}
+# native hardware is not that powerful
+lo_jobs=""
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
@@ -379,6 +384,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
     else
         mem_per_process=200
     fi
+%if 0%{?qemu_user_space_build:1}
+    mem_per_process=400
+%endif
     max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes
index 0ed9cad..fac85aa 100644
--- a/libreoffice-help-group2.changes
+++ b/libreoffice-help-group2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
+
+- raise memory limits / lower parallelism for emulated/native arm builds
+
 -------------------------------------------------------------------
 Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
 
@@ -26,8 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com
 - update version 3.6.1.2
 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
   (bnc#775840)
-- add subpackages: Greek(el), Basque(eu), Finnish(fi)
-- move Galician(gl) to the group3 source package
+- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
 
 -------------------------------------------------------------------
 Thu Aug  9 09:34:09 UTC 2012 - pmladek@suse.com
@@ -209,6 +213,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com
 - started building helpcontent without libreoffice-*-devel packages;
   split build had not longer be supported with LO-3.4; disabled many
   features to keep minimal build dependencies
+- removed help-ar package because it used English strings
 
 -------------------------------------------------------------------
 Wed Jun  8 17:29:54 CEST 2011 - pmladek@suse.cz
diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec
index 2ed89a1..c3c64aa 100644
--- a/libreoffice-help-group2.spec
+++ b/libreoffice-help-group2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-help-group2
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -355,6 +355,11 @@ cd -
 BUILD_SCRIPT_FLAGS=
 # dmake does not work with more than 64 jobs
 lo_jobs="%{?jobs:%jobs}"
+%ifarch %arm
+%if ! 0%{?qemu_user_space_build:1}
+# native hardware is not that powerful
+lo_jobs=""
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
@@ -367,6 +372,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
     else
         mem_per_process=200
     fi
+%if 0%{?qemu_user_space_build:1}
+    mem_per_process=400
+%endif
     max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes
index 8a387df..fac85aa 100644
--- a/libreoffice-help-group3.changes
+++ b/libreoffice-help-group3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
+
+- raise memory limits / lower parallelism for emulated/native arm builds
+
 -------------------------------------------------------------------
 Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
 
@@ -26,7 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com
 - update version 3.6.1.2
 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
   (bnc#775840)
-- move Galician(gl) subpackage from the group2 source package
+- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
 
 -------------------------------------------------------------------
 Thu Aug  9 09:34:09 UTC 2012 - pmladek@suse.com
@@ -208,6 +213,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com
 - started building helpcontent without libreoffice-*-devel packages;
   split build had not longer be supported with LO-3.4; disabled many
   features to keep minimal build dependencies
+- removed help-ar package because it used English strings
 
 -------------------------------------------------------------------
 Wed Jun  8 17:29:54 CEST 2011 - pmladek@suse.cz
@@ -395,8 +401,6 @@ Mon Dec  7 17:53:37 CET 2009 - pmladek@suse.cz
 - updated to the milestone ooo320-m7
 - updated ooo-build to version 3.1.99.4 (3.2-beta4)
 - removed obsolete extra localization sources
-- used the renamed "gu" instead of "gu-IN" lang code; kept the package
-  name to keep the backward compatibility
 
 -------------------------------------------------------------------
 Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz
diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec
index 37ec141..a17537f 100644
--- a/libreoffice-help-group3.spec
+++ b/libreoffice-help-group3.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-help-group3
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -367,6 +367,11 @@ cd -
 BUILD_SCRIPT_FLAGS=
 # dmake does not work with more than 64 jobs
 lo_jobs="%{?jobs:%jobs}"
+%ifarch %arm
+%if ! 0%{?qemu_user_space_build:1}
+# native hardware is not that powerful
+lo_jobs=""
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
@@ -379,6 +384,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
     else
         mem_per_process=200
     fi
+%if 0%{?qemu_user_space_build:1}
+    mem_per_process=400
+%endif
     max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes
index a47b5b7..fac85aa 100644
--- a/libreoffice-help-group4.changes
+++ b/libreoffice-help-group4.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
+
+- raise memory limits / lower parallelism for emulated/native arm builds
+
 -------------------------------------------------------------------
 Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
 
@@ -26,8 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com
 - update version 3.6.1.2
 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
   (bnc#775840)
-- move Brazilian Portuguese(pt-BR) from the group5 source package
-- add subpackages: Macedonian(mk), Norwegian Bokmaal(nb)
+- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
 
 -------------------------------------------------------------------
 Thu Aug  9 09:34:09 UTC 2012 - pmladek@suse.com
@@ -209,7 +213,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com
 - started building helpcontent without libreoffice-*-devel packages;
   split build had not longer be supported with LO-3.4; disabled many
   features to keep minimal build dependencies
-- removed help-pa-IN package because it used English strings
+- removed help-ar package because it used English strings
 
 -------------------------------------------------------------------
 Wed Jun  8 17:29:54 CEST 2011 - pmladek@suse.cz
diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec
index a147605..2aa1556 100644
--- a/libreoffice-help-group4.spec
+++ b/libreoffice-help-group4.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-help-group4
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -355,6 +355,11 @@ cd -
 BUILD_SCRIPT_FLAGS=
 # dmake does not work with more than 64 jobs
 lo_jobs="%{?jobs:%jobs}"
+%ifarch %arm
+%if ! 0%{?qemu_user_space_build:1}
+# native hardware is not that powerful
+lo_jobs=""
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
@@ -367,6 +372,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
     else
         mem_per_process=200
     fi
+%if 0%{?qemu_user_space_build:1}
+    mem_per_process=400
+%endif
     max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes
index a4b33d4..fac85aa 100644
--- a/libreoffice-help-group5.changes
+++ b/libreoffice-help-group5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
+
+- raise memory limits / lower parallelism for emulated/native arm builds
+
 -------------------------------------------------------------------
 Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
 
@@ -26,8 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com
 - update version 3.6.1.2
 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
   (bnc#775840)
-- add subpackages: Slovak(sk), Turkish(tr), Vietnamese(vi)
-- move Brazilian Portuguese(pt-BR) to the group4 source package
+- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
 
 -------------------------------------------------------------------
 Thu Aug  9 09:34:09 UTC 2012 - pmladek@suse.com
@@ -209,6 +213,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com
 - started building helpcontent without libreoffice-*-devel packages;
   split build had not longer be supported with LO-3.4; disabled many
   features to keep minimal build dependencies
+- removed help-ar package because it used English strings
 
 -------------------------------------------------------------------
 Wed Jun  8 17:29:54 CEST 2011 - pmladek@suse.cz
diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec
index 8a90e5d..14bf539 100644
--- a/libreoffice-help-group5.spec
+++ b/libreoffice-help-group5.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-help-group5
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -382,6 +382,11 @@ cd -
 BUILD_SCRIPT_FLAGS=
 # dmake does not work with more than 64 jobs
 lo_jobs="%{?jobs:%jobs}"
+%ifarch %arm
+%if ! 0%{?qemu_user_space_build:1}
+# native hardware is not that powerful
+lo_jobs=""
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
@@ -394,6 +399,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
     else
         mem_per_process=200
     fi
+%if 0%{?qemu_user_space_build:1}
+    mem_per_process=400
+%endif
     max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in
index 377e345..ffc5e69 100644
--- a/libreoffice-help-groupX.spec.in
+++ b/libreoffice-help-groupX.spec.in
@@ -160,6 +160,11 @@ cd -
 BUILD_SCRIPT_FLAGS=
 # dmake does not work with more than 64 jobs
 lo_jobs="%{?jobs:%jobs}"
+%ifarch %arm
+%if ! 0%{?qemu_user_space_build:1}
+# native hardware is not that powerful
+lo_jobs=""
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
@@ -172,6 +177,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
     else
         mem_per_process=200
     fi
+%if 0%{?qemu_user_space_build:1}
+    mem_per_process=400
+%endif
     max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec
index b1d6851..abba577 100644
--- a/libreoffice-icon-themes.spec
+++ b/libreoffice-icon-themes.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-icon-themes
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec
index 6ac8152..8a4dfbd 100644
--- a/libreoffice-l10n.spec
+++ b/libreoffice-l10n.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice-l10n
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -1664,8 +1664,8 @@ PreReq:         grep
 PreReq:         libreoffice >= 3.5
 %endif
 Requires:       libreoffice = %{version}
-Provides:       OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res
 Provides:       OpenOffice_org-sh-YU = %version
+Provides:       OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res
 Obsoletes:      OpenOffice_org-sh-YU < %version
 # compat stuff
 Provides:       OpenOffice_org-sh = %{version}
@@ -1752,8 +1752,8 @@ PreReq:         libreoffice >= 3.5
 %endif
 Requires:       libreoffice = %{version}
 Requires:       scalable-font-ru
-Provides:       OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res
 Provides:       OpenOffice_org-sr-CS = %version
+Provides:       OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res
 Obsoletes:      OpenOffice_org-sr-CS < %version
 # compat stuff
 Provides:       OpenOffice_org-sr = %{version}
diff --git a/libreoffice.spec b/libreoffice.spec
index c6909a7..0189c26 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libreoffice
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

From 1147d52e34edf4893984ebdd74966a6e51026380c92490e17829416207a8be66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sat, 19 Jan 2013 14:57:41 +0000
Subject: [PATCH 2/4] Accepting request 149234 from devel:Factory:ARM

OBS-URL: https://build.opensuse.org/request/show/149234
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=22
---
 libreoffice-help-group1.spec    | 1 +
 libreoffice-help-group2.spec    | 1 +
 libreoffice-help-group3.spec    | 1 +
 libreoffice-help-group4.spec    | 1 +
 libreoffice-help-group5.spec    | 1 +
 libreoffice-help-groupX.spec.in | 1 +
 6 files changed, 6 insertions(+)

diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec
index 034ee88..b2e3f4e 100644
--- a/libreoffice-help-group1.spec
+++ b/libreoffice-help-group1.spec
@@ -372,6 +372,7 @@ lo_jobs="%{?jobs:%jobs}"
 # native hardware is not that powerful
 lo_jobs=""
 %endif
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec
index c3c64aa..f23ceb9 100644
--- a/libreoffice-help-group2.spec
+++ b/libreoffice-help-group2.spec
@@ -360,6 +360,7 @@ lo_jobs="%{?jobs:%jobs}"
 # native hardware is not that powerful
 lo_jobs=""
 %endif
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec
index a17537f..51fd27d 100644
--- a/libreoffice-help-group3.spec
+++ b/libreoffice-help-group3.spec
@@ -372,6 +372,7 @@ lo_jobs="%{?jobs:%jobs}"
 # native hardware is not that powerful
 lo_jobs=""
 %endif
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec
index 2aa1556..efdbf12 100644
--- a/libreoffice-help-group4.spec
+++ b/libreoffice-help-group4.spec
@@ -360,6 +360,7 @@ lo_jobs="%{?jobs:%jobs}"
 # native hardware is not that powerful
 lo_jobs=""
 %endif
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec
index 14bf539..431310b 100644
--- a/libreoffice-help-group5.spec
+++ b/libreoffice-help-group5.spec
@@ -387,6 +387,7 @@ lo_jobs="%{?jobs:%jobs}"
 # native hardware is not that powerful
 lo_jobs=""
 %endif
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"
diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in
index ffc5e69..0fc01d9 100644
--- a/libreoffice-help-groupX.spec.in
+++ b/libreoffice-help-groupX.spec.in
@@ -165,6 +165,7 @@ lo_jobs="%{?jobs:%jobs}"
 # native hardware is not that powerful
 lo_jobs=""
 %endif
+%endif
 if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
     echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
     lo_jobs="64"

From 7a04f230232e2676494e2159de538362a426c45d2454e6ce1f94b85665166bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sat, 19 Jan 2013 14:59:23 +0000
Subject: [PATCH 3/4] Fix the help changelogs so we can be merged to factory
 again.

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=23
---
 libreoffice-branding-upstream.spec |  1 +
 libreoffice-help-en-US.spec        |  1 +
 libreoffice-help-group1.spec       |  3 ++
 libreoffice-help-group2.changes    |  4 +-
 libreoffice-help-group2.spec       |  3 ++
 libreoffice-help-group3.changes    |  5 +-
 libreoffice-help-group3.spec       |  3 ++
 libreoffice-help-group4.changes    |  5 +-
 libreoffice-help-group4.spec       |  3 ++
 libreoffice-help-group5.changes    |  4 +-
 libreoffice-help-group5.spec       |  3 ++
 libreoffice-icon-themes.spec       |  1 +
 libreoffice-l10n.spec              | 84 ++++++++++++++++++++++++++++--
 libreoffice.spec                   |  1 +
 14 files changed, 108 insertions(+), 13 deletions(-)

diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec
index 63fab67..460885a 100644
--- a/libreoffice-branding-upstream.spec
+++ b/libreoffice-branding-upstream.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice-branding-upstream
 Version:        3.6.3.2.4
 Release:        0
diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec
index 2226e79..9b06f78 100644
--- a/libreoffice-help-en-US.spec
+++ b/libreoffice-help-en-US.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice-help-en-US
 ###################################################################
 ## DO NOT EDIT THIS SPEC FILE
diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec
index b2e3f4e..2b2614c 100644
--- a/libreoffice-help-group1.spec
+++ b/libreoffice-help-group1.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice-help-group1
 ###################################################################
 ## DO NOT EDIT THIS SPEC FILE
@@ -123,6 +124,7 @@ This package provides files related to the LibreOffice help
 development.
 
 %if %test_build_langs >= 2
+
 %package -n libreoffice-help-ast
 Summary:        Asturian Help Localization for LibreOffice
 Group:          Productivity/Office/Suite
@@ -598,6 +600,7 @@ rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null
 %endif
 
 %if %test_build_langs >= 2
+
 %files -f file-lists/help_ast_list.txt -n libreoffice-help-ast
 %defattr(-,root,root)
 
diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes
index fac85aa..9156f9c 100644
--- a/libreoffice-help-group2.changes
+++ b/libreoffice-help-group2.changes
@@ -31,7 +31,8 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com
 - update version 3.6.1.2
 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
   (bnc#775840)
-- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
+- add subpackages: Greek(el), Basque(eu), Finnish(fi)
+- move Galician(gl) to the group3 source package
 
 -------------------------------------------------------------------
 Thu Aug  9 09:34:09 UTC 2012 - pmladek@suse.com
@@ -213,7 +214,6 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com
 - started building helpcontent without libreoffice-*-devel packages;
   split build had not longer be supported with LO-3.4; disabled many
   features to keep minimal build dependencies
-- removed help-ar package because it used English strings
 
 -------------------------------------------------------------------
 Wed Jun  8 17:29:54 CEST 2011 - pmladek@suse.cz
diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec
index f23ceb9..039ccd7 100644
--- a/libreoffice-help-group2.spec
+++ b/libreoffice-help-group2.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice-help-group2
 ###################################################################
 ## DO NOT EDIT THIS SPEC FILE
@@ -123,6 +124,7 @@ This package provides files related to the LibreOffice help
 development.
 
 %if %test_build_langs >= 2
+
 %package -n libreoffice-help-el
 Summary:        Greek Help Localization for LibreOffice
 Group:          Productivity/Office/Suite
@@ -574,6 +576,7 @@ rm -f %_datadir/%lo_home/help_fr_list.txt.postun 2>/dev/null
 %endif
 
 %if %test_build_langs >= 2
+
 %files -f file-lists/help_el_list.txt -n libreoffice-help-el
 %defattr(-,root,root)
 
diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes
index fac85aa..dd6f779 100644
--- a/libreoffice-help-group3.changes
+++ b/libreoffice-help-group3.changes
@@ -31,7 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com
 - update version 3.6.1.2
 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
   (bnc#775840)
-- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
+- move Galician(gl) subpackage from the group2 source package
 
 -------------------------------------------------------------------
 Thu Aug  9 09:34:09 UTC 2012 - pmladek@suse.com
@@ -213,7 +213,6 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com
 - started building helpcontent without libreoffice-*-devel packages;
   split build had not longer be supported with LO-3.4; disabled many
   features to keep minimal build dependencies
-- removed help-ar package because it used English strings
 
 -------------------------------------------------------------------
 Wed Jun  8 17:29:54 CEST 2011 - pmladek@suse.cz
@@ -401,6 +400,8 @@ Mon Dec  7 17:53:37 CET 2009 - pmladek@suse.cz
 - updated to the milestone ooo320-m7
 - updated ooo-build to version 3.1.99.4 (3.2-beta4)
 - removed obsolete extra localization sources
+- used the renamed "gu" instead of "gu-IN" lang code; kept the package
+  name to keep the backward compatibility
 
 -------------------------------------------------------------------
 Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz
diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec
index 51fd27d..99ebbfe 100644
--- a/libreoffice-help-group3.spec
+++ b/libreoffice-help-group3.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice-help-group3
 ###################################################################
 ## DO NOT EDIT THIS SPEC FILE
@@ -123,6 +124,7 @@ This package provides files related to the LibreOffice help
 development.
 
 %if %test_build_langs >= 2
+
 %package -n libreoffice-help-gl
 Summary:        Galician Help Localization for LibreOffice
 Group:          Productivity/Office/Suite
@@ -598,6 +600,7 @@ rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null
 %endif
 
 %if %test_build_langs >= 2
+
 %files -f file-lists/help_gl_list.txt -n libreoffice-help-gl
 %defattr(-,root,root)
 
diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes
index fac85aa..c9aea4d 100644
--- a/libreoffice-help-group4.changes
+++ b/libreoffice-help-group4.changes
@@ -31,7 +31,8 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com
 - update version 3.6.1.2
 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
   (bnc#775840)
-- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
+- move Brazilian Portuguese(pt-BR) from the group5 source package
+- add subpackages: Macedonian(mk), Norwegian Bokmaal(nb)
 
 -------------------------------------------------------------------
 Thu Aug  9 09:34:09 UTC 2012 - pmladek@suse.com
@@ -213,7 +214,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com
 - started building helpcontent without libreoffice-*-devel packages;
   split build had not longer be supported with LO-3.4; disabled many
   features to keep minimal build dependencies
-- removed help-ar package because it used English strings
+- removed help-pa-IN package because it used English strings
 
 -------------------------------------------------------------------
 Wed Jun  8 17:29:54 CEST 2011 - pmladek@suse.cz
diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec
index efdbf12..bbebfff 100644
--- a/libreoffice-help-group4.spec
+++ b/libreoffice-help-group4.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice-help-group4
 ###################################################################
 ## DO NOT EDIT THIS SPEC FILE
@@ -123,6 +124,7 @@ This package provides files related to the LibreOffice help
 development.
 
 %if %test_build_langs >= 2
+
 %package -n libreoffice-help-ko
 Summary:        Korean Help Localization for LibreOffice
 Group:          Productivity/Office/Suite
@@ -574,6 +576,7 @@ rm -f %_datadir/%lo_home/help_pt_BR_list.txt.postun 2>/dev/null
 %endif
 
 %if %test_build_langs >= 2
+
 %files -f file-lists/help_ko_list.txt -n libreoffice-help-ko
 %defattr(-,root,root)
 
diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes
index fac85aa..a7389e4 100644
--- a/libreoffice-help-group5.changes
+++ b/libreoffice-help-group5.changes
@@ -31,7 +31,8 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com
 - update version 3.6.1.2
 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
   (bnc#775840)
-- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
+- add subpackages: Slovak(sk), Turkish(tr), Vietnamese(vi)
+- move Brazilian Portuguese(pt-BR) to the group4 source package
 
 -------------------------------------------------------------------
 Thu Aug  9 09:34:09 UTC 2012 - pmladek@suse.com
@@ -213,7 +214,6 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com
 - started building helpcontent without libreoffice-*-devel packages;
   split build had not longer be supported with LO-3.4; disabled many
   features to keep minimal build dependencies
-- removed help-ar package because it used English strings
 
 -------------------------------------------------------------------
 Wed Jun  8 17:29:54 CEST 2011 - pmladek@suse.cz
diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec
index 431310b..62ba9dc 100644
--- a/libreoffice-help-group5.spec
+++ b/libreoffice-help-group5.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice-help-group5
 ###################################################################
 ## DO NOT EDIT THIS SPEC FILE
@@ -123,6 +124,7 @@ This package provides files related to the LibreOffice help
 development.
 
 %if %test_build_langs >= 2
+
 %package -n libreoffice-help-ru
 Summary:        Russian Help Localization for LibreOffice
 Group:          Productivity/Office/Suite
@@ -612,6 +614,7 @@ rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null
 %endif
 
 %if %test_build_langs >= 2
+
 %files -f file-lists/help_ru_list.txt -n libreoffice-help-ru
 %defattr(-,root,root)
 
diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec
index abba577..7af5d2e 100644
--- a/libreoffice-icon-themes.spec
+++ b/libreoffice-icon-themes.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice-icon-themes
 Version:        3.6.3.2.4
 Release:        0
diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec
index 8a4dfbd..91c27a1 100644
--- a/libreoffice-l10n.spec
+++ b/libreoffice-l10n.spec
@@ -16,11 +16,7 @@
 #
 
 
-###################################################################
-## DO NOT EDIT THIS SPEC FILE
-## Generated by:
-## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data
-###################################################################
+
 Name:           libreoffice-l10n
 Version:        3.6.3.2.4
 Release:        0
@@ -70,6 +66,7 @@ This source package is used to build the LibreOffice artwork
 development package.
 
 %if %test_build_langs >= 2
+
 %package -n libreoffice-l10n-af
 Summary:        African Localization Files for LibreOffice
 Group:          Productivity/Office/Suite
@@ -2259,6 +2256,7 @@ rm -rf %{buildroot}
 
 %if %test_build_langs >= 2
 # af
+
 %posttrans -n libreoffice-l10n-af
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_af_list.txt || true
 
@@ -2269,6 +2267,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_af_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_af_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_af_list.txt.postun 2>/dev/null
 # am
+
 %posttrans -n libreoffice-l10n-am
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_am_list.txt || true
 
@@ -2279,6 +2278,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_am_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_am_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_am_list.txt.postun 2>/dev/null
 # ar
+
 %posttrans -n libreoffice-l10n-ar
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ar_list.txt || true
 
@@ -2289,6 +2289,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ar_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ar_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ar_list.txt.postun 2>/dev/null
 # as
+
 %posttrans -n libreoffice-l10n-as
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_as_list.txt || true
 
@@ -2299,6 +2300,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_as_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_as_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_as_list.txt.postun 2>/dev/null
 # ast
+
 %posttrans -n libreoffice-l10n-ast
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ast_list.txt || true
 
@@ -2309,6 +2311,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ast_list.txt %{_datadir}/%ooo_h
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ast_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ast_list.txt.postun 2>/dev/null
 # be-BY
+
 %posttrans -n libreoffice-l10n-be-BY
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_be_list.txt || true
 
@@ -2319,6 +2322,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_be_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_be_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_be_list.txt.postun 2>/dev/null
 # bg
+
 %posttrans -n libreoffice-l10n-bg
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_bg_list.txt || true
 
@@ -2329,6 +2333,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_bg_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_bg_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_bg_list.txt.postun 2>/dev/null
 # br
+
 %posttrans -n libreoffice-l10n-br
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_br_list.txt || true
 
@@ -2339,6 +2344,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_br_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_br_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_br_list.txt.postun 2>/dev/null
 # ca
+
 %posttrans -n libreoffice-l10n-ca
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ca_list.txt || true
 
@@ -2352,6 +2358,7 @@ rm -f %{_datadir}/%ooo_home/lang_ca_list.txt.postun 2>/dev/null
 %if %test_build_langs >= 1
 
 # cs
+
 %posttrans -n libreoffice-l10n-cs
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_cs_list.txt || true
 
@@ -2365,6 +2372,7 @@ rm -f %{_datadir}/%ooo_home/lang_cs_list.txt.postun 2>/dev/null
 %if %test_build_langs >= 2
 
 # cy
+
 %posttrans -n libreoffice-l10n-cy
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_cy_list.txt || true
 
@@ -2375,6 +2383,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_cy_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_cy_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_cy_list.txt.postun 2>/dev/null
 # da
+
 %posttrans -n libreoffice-l10n-da
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_da_list.txt || true
 
@@ -2388,6 +2397,7 @@ rm -f %{_datadir}/%ooo_home/lang_da_list.txt.postun 2>/dev/null
 %if %test_build_langs >= 1
 
 # de
+
 %posttrans -n libreoffice-l10n-de
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_de_list.txt || true
 
@@ -2401,6 +2411,7 @@ rm -f %{_datadir}/%ooo_home/lang_de_list.txt.postun 2>/dev/null
 %if %test_build_langs >= 2
 
 # el
+
 %posttrans -n libreoffice-l10n-el
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_el_list.txt || true
 
@@ -2411,6 +2422,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_el_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_el_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_el_list.txt.postun 2>/dev/null
 # en-GB
+
 %posttrans -n libreoffice-l10n-en-GB
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_en_GB_list.txt || true
 
@@ -2421,6 +2433,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_en_GB_list.txt %{_datadir}/%ooo
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_en_GB_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_en_GB_list.txt.postun 2>/dev/null
 # en-ZA
+
 %posttrans -n libreoffice-l10n-en-ZA
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_en_ZA_list.txt || true
 
@@ -2431,6 +2444,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_en_ZA_list.txt %{_datadir}/%ooo
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_en_ZA_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_en_ZA_list.txt.postun 2>/dev/null
 # eo
+
 %posttrans -n libreoffice-l10n-eo
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_eo_list.txt || true
 
@@ -2441,6 +2455,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_eo_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_eo_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_eo_list.txt.postun 2>/dev/null
 # es
+
 %posttrans -n libreoffice-l10n-es
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_es_list.txt || true
 
@@ -2451,6 +2466,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_es_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_es_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_es_list.txt.postun 2>/dev/null
 # et
+
 %posttrans -n libreoffice-l10n-et
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_et_list.txt || true
 
@@ -2461,6 +2477,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_et_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_et_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_et_list.txt.postun 2>/dev/null
 # eu
+
 %posttrans -n libreoffice-l10n-eu
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_eu_list.txt || true
 
@@ -2471,6 +2488,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_eu_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_eu_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_eu_list.txt.postun 2>/dev/null
 # fi
+
 %posttrans -n libreoffice-l10n-fi
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_fi_list.txt || true
 
@@ -2481,6 +2499,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_fi_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_fi_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_fi_list.txt.postun 2>/dev/null
 # fr
+
 %posttrans -n libreoffice-l10n-fr
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_fr_list.txt || true
 
@@ -2491,6 +2510,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_fr_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_fr_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_fr_list.txt.postun 2>/dev/null
 # ga
+
 %posttrans -n libreoffice-l10n-ga
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ga_list.txt || true
 
@@ -2501,6 +2521,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ga_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ga_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ga_list.txt.postun 2>/dev/null
 # gd
+
 %posttrans -n libreoffice-l10n-gd
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gd_list.txt || true
 
@@ -2511,6 +2532,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gd_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gd_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_gd_list.txt.postun 2>/dev/null
 # gl
+
 %posttrans -n libreoffice-l10n-gl
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gl_list.txt || true
 
@@ -2521,6 +2543,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gl_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gl_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_gl_list.txt.postun 2>/dev/null
 # gu-IN
+
 %posttrans -n libreoffice-l10n-gu-IN
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gu_list.txt || true
 
@@ -2531,6 +2554,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gu_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gu_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_gu_list.txt.postun 2>/dev/null
 # he
+
 %posttrans -n libreoffice-l10n-he
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_he_list.txt || true
 
@@ -2541,6 +2565,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_he_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_he_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_he_list.txt.postun 2>/dev/null
 # hi-IN
+
 %posttrans -n libreoffice-l10n-hi-IN
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hi_list.txt || true
 
@@ -2551,6 +2576,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_hi_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_hi_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_hi_list.txt.postun 2>/dev/null
 # hr
+
 %posttrans -n libreoffice-l10n-hr
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hr_list.txt || true
 
@@ -2564,6 +2590,7 @@ rm -f %{_datadir}/%ooo_home/lang_hr_list.txt.postun 2>/dev/null
 %if %test_build_langs >= 1
 
 # hu
+
 %posttrans -n libreoffice-l10n-hu
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hu_list.txt || true
 
@@ -2577,6 +2604,7 @@ rm -f %{_datadir}/%ooo_home/lang_hu_list.txt.postun 2>/dev/null
 %if %test_build_langs >= 2
 
 # id
+
 %posttrans -n libreoffice-l10n-id
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_id_list.txt || true
 
@@ -2587,6 +2615,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_id_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_id_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_id_list.txt.postun 2>/dev/null
 # is
+
 %posttrans -n libreoffice-l10n-is
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_is_list.txt || true
 
@@ -2597,6 +2626,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_is_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_is_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_is_list.txt.postun 2>/dev/null
 # it
+
 %posttrans -n libreoffice-l10n-it
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_it_list.txt || true
 
@@ -2610,6 +2640,7 @@ rm -f %{_datadir}/%ooo_home/lang_it_list.txt.postun 2>/dev/null
 %if %test_build_langs >= 1
 
 # ja
+
 %posttrans -n libreoffice-l10n-ja
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ja_list.txt || true
 
@@ -2623,6 +2654,7 @@ rm -f %{_datadir}/%ooo_home/lang_ja_list.txt.postun 2>/dev/null
 %if %test_build_langs >= 2
 
 # ka
+
 %posttrans -n libreoffice-l10n-ka
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ka_list.txt || true
 
@@ -2633,6 +2665,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ka_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ka_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ka_list.txt.postun 2>/dev/null
 # km
+
 %posttrans -n libreoffice-l10n-km
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_km_list.txt || true
 
@@ -2643,6 +2676,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_km_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_km_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_km_list.txt.postun 2>/dev/null
 # kn
+
 %posttrans -n libreoffice-l10n-kn
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_kn_list.txt || true
 
@@ -2653,6 +2687,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_kn_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_kn_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_kn_list.txt.postun 2>/dev/null
 # ko
+
 %posttrans -n libreoffice-l10n-ko
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ko_list.txt || true
 
@@ -2663,6 +2698,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ko_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ko_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ko_list.txt.postun 2>/dev/null
 # lt
+
 %posttrans -n libreoffice-l10n-lt
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_lt_list.txt || true
 
@@ -2673,6 +2709,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_lt_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_lt_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_lt_list.txt.postun 2>/dev/null
 # mk
+
 %posttrans -n libreoffice-l10n-mk
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_mk_list.txt || true
 
@@ -2683,6 +2720,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_mk_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_mk_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_mk_list.txt.postun 2>/dev/null
 # ml
+
 %posttrans -n libreoffice-l10n-ml
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ml_list.txt || true
 
@@ -2693,6 +2731,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ml_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ml_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ml_list.txt.postun 2>/dev/null
 # mr
+
 %posttrans -n libreoffice-l10n-mr
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_mr_list.txt || true
 
@@ -2703,6 +2742,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_mr_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_mr_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_mr_list.txt.postun 2>/dev/null
 # nb
+
 %posttrans -n libreoffice-l10n-nb
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nb_list.txt || true
 
@@ -2713,6 +2753,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nb_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nb_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_nb_list.txt.postun 2>/dev/null
 # nl
+
 %posttrans -n libreoffice-l10n-nl
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nl_list.txt || true
 
@@ -2723,6 +2764,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nl_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nl_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_nl_list.txt.postun 2>/dev/null
 # nn
+
 %posttrans -n libreoffice-l10n-nn
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nn_list.txt || true
 
@@ -2733,6 +2775,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nn_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nn_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_nn_list.txt.postun 2>/dev/null
 # nr
+
 %posttrans -n libreoffice-l10n-nr
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nr_list.txt || true
 
@@ -2743,6 +2786,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nr_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nr_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_nr_list.txt.postun 2>/dev/null
 # om
+
 %posttrans -n libreoffice-l10n-om
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_om_list.txt || true
 
@@ -2753,6 +2797,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_om_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_om_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_om_list.txt.postun 2>/dev/null
 # or
+
 %posttrans -n libreoffice-l10n-or
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_or_list.txt || true
 
@@ -2763,6 +2808,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_or_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_or_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_or_list.txt.postun 2>/dev/null
 # pa-IN
+
 %posttrans -n libreoffice-l10n-pa-IN
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pa_IN_list.txt || true
 
@@ -2773,6 +2819,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pa_IN_list.txt %{_datadir}/%ooo
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pa_IN_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_pa_IN_list.txt.postun 2>/dev/null
 # pl
+
 %posttrans -n libreoffice-l10n-pl
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pl_list.txt || true
 
@@ -2783,6 +2830,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pl_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pl_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_pl_list.txt.postun 2>/dev/null
 # pt
+
 %posttrans -n libreoffice-l10n-pt
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pt_list.txt || true
 
@@ -2793,6 +2841,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pt_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pt_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_pt_list.txt.postun 2>/dev/null
 # pt-BR
+
 %posttrans -n libreoffice-l10n-pt-BR
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pt_BR_list.txt || true
 
@@ -2803,6 +2852,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pt_BR_list.txt %{_datadir}/%ooo
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pt_BR_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_pt_BR_list.txt.postun 2>/dev/null
 # ro
+
 %posttrans -n libreoffice-l10n-ro
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ro_list.txt || true
 
@@ -2813,6 +2863,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ro_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ro_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ro_list.txt.postun 2>/dev/null
 # ru
+
 %posttrans -n libreoffice-l10n-ru
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ru_list.txt || true
 
@@ -2823,6 +2874,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ru_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ru_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ru_list.txt.postun 2>/dev/null
 # rw
+
 %posttrans -n libreoffice-l10n-rw
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_rw_list.txt || true
 
@@ -2833,6 +2885,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_rw_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_rw_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_rw_list.txt.postun 2>/dev/null
 # sh
+
 %posttrans -n libreoffice-l10n-sh
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sh_list.txt || true
 
@@ -2843,6 +2896,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sh_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sh_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_sh_list.txt.postun 2>/dev/null
 # sk
+
 %posttrans -n libreoffice-l10n-sk
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sk_list.txt || true
 
@@ -2853,6 +2907,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sk_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sk_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_sk_list.txt.postun 2>/dev/null
 # sl
+
 %posttrans -n libreoffice-l10n-sl
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sl_list.txt || true
 
@@ -2863,6 +2918,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sl_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sl_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_sl_list.txt.postun 2>/dev/null
 # sr
+
 %posttrans -n libreoffice-l10n-sr
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sr_list.txt || true
 
@@ -2873,6 +2929,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sr_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sr_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_sr_list.txt.postun 2>/dev/null
 # ss
+
 %posttrans -n libreoffice-l10n-ss
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ss_list.txt || true
 
@@ -2883,6 +2940,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ss_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ss_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ss_list.txt.postun 2>/dev/null
 # st
+
 %posttrans -n libreoffice-l10n-st
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_st_list.txt || true
 
@@ -2893,6 +2951,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_st_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_st_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_st_list.txt.postun 2>/dev/null
 # sv
+
 %posttrans -n libreoffice-l10n-sv
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sv_list.txt || true
 
@@ -2903,6 +2962,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sv_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sv_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_sv_list.txt.postun 2>/dev/null
 # ta
+
 %posttrans -n libreoffice-l10n-ta
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ta_list.txt || true
 
@@ -2913,6 +2973,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ta_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ta_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ta_list.txt.postun 2>/dev/null
 # te
+
 %posttrans -n libreoffice-l10n-te
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_te_list.txt || true
 
@@ -2923,6 +2984,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_te_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_te_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_te_list.txt.postun 2>/dev/null
 # tg
+
 %posttrans -n libreoffice-l10n-tg
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_tg_list.txt || true
 
@@ -2933,6 +2995,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_tg_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_tg_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_tg_list.txt.postun 2>/dev/null
 # th
+
 %posttrans -n libreoffice-l10n-th
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_th_list.txt || true
 
@@ -2943,6 +3006,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_th_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_th_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_th_list.txt.postun 2>/dev/null
 # tr
+
 %posttrans -n libreoffice-l10n-tr
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_tr_list.txt || true
 
@@ -2953,6 +3017,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_tr_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_tr_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_tr_list.txt.postun 2>/dev/null
 # ts
+
 %posttrans -n libreoffice-l10n-ts
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ts_list.txt || true
 
@@ -2963,6 +3028,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ts_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ts_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ts_list.txt.postun 2>/dev/null
 # ug
+
 %posttrans -n libreoffice-l10n-ug
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ug_list.txt || true
 
@@ -2973,6 +3039,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ug_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ug_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ug_list.txt.postun 2>/dev/null
 # uk
+
 %posttrans -n libreoffice-l10n-uk
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_uk_list.txt || true
 
@@ -2983,6 +3050,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_uk_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_uk_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_uk_list.txt.postun 2>/dev/null
 # ve
+
 %posttrans -n libreoffice-l10n-ve
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ve_list.txt || true
 
@@ -2993,6 +3061,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ve_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ve_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_ve_list.txt.postun 2>/dev/null
 # vi
+
 %posttrans -n libreoffice-l10n-vi
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_vi_list.txt || true
 
@@ -3003,6 +3072,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_vi_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_vi_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_vi_list.txt.postun 2>/dev/null
 # xh
+
 %posttrans -n libreoffice-l10n-xh
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_xh_list.txt || true
 
@@ -3013,6 +3083,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_xh_list.txt %{_datadir}/%ooo_ho
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_xh_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_xh_list.txt.postun 2>/dev/null
 # zh-CN
+
 %posttrans -n libreoffice-l10n-zh-CN
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zh_CN_list.txt || true
 
@@ -3023,6 +3094,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_zh_CN_list.txt %{_datadir}/%ooo
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_zh_CN_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_zh_CN_list.txt.postun 2>/dev/null
 # zh-TW
+
 %posttrans -n libreoffice-l10n-zh-TW
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zh_TW_list.txt || true
 
@@ -3033,6 +3105,7 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_zh_TW_list.txt %{_datadir}/%ooo
 test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_zh_TW_list.txt.postun || true
 rm -f %{_datadir}/%ooo_home/lang_zh_TW_list.txt.postun 2>/dev/null
 # zu
+
 %posttrans -n libreoffice-l10n-zu
 %{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zu_list.txt || true
 
@@ -3045,6 +3118,7 @@ rm -f %{_datadir}/%ooo_home/lang_zu_list.txt.postun 2>/dev/null
 %endif
 
 %if %test_build_langs >= 2
+
 %files -f lang_af_list.txt -n libreoffice-l10n-af
 %defattr(-,root,root)
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 0189c26..9247e6a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           libreoffice
 BuildRequires:  ImageMagick
 BuildRequires:  ant

From 3fc707e7bbe63828c00bb7e72ed4c74acb5665109b36c68ada54479bd4f6eeac Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.com>
Date: Fri, 25 Jan 2013 15:10:14 +0000
Subject: [PATCH 4/4] Accepting request 149943 from LibreOffice:Stable

- do-not-delete-PropertyMapEntry-instance.diff: lost charts (bnc#798271)

OBS-URL: https://build.opensuse.org/request/show/149943
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=24
---
 do-not-delete-PropertyMapEntry-instance.diff | 75 ++++++++++++++++++++
 libreoffice.changes                          |  5 ++
 libreoffice.spec                             |  3 +
 3 files changed, 83 insertions(+)
 create mode 100644 do-not-delete-PropertyMapEntry-instance.diff

diff --git a/do-not-delete-PropertyMapEntry-instance.diff b/do-not-delete-PropertyMapEntry-instance.diff
new file mode 100644
index 0000000..f36df54
--- /dev/null
+++ b/do-not-delete-PropertyMapEntry-instance.diff
@@ -0,0 +1,75 @@
+From 4153bcbc8e568e8e33c56bab68e9ea036c5dce5b Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com>
+Date: Thu, 24 Jan 2013 22:24:44 -0500
+Subject: [PATCH] bnc#798271: Don't delete the PropertyMapEntry instance
+ prematurely.
+
+When using comphelper::PropertyMapEntry array to create a UNO property
+set, we need to make sure we keep this instance while the property set
+object is alive, else it would cause a very hard-to-debug problem down
+the road...
+
+In this particular case, the aExportInfoMap array instance was destroyed
+when it went out of scope, but the xInfoSet which references it was used
+afterward.
+
+Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
+---
+ chart2/source/model/filter/XMLFilter.cxx | 40 +++++++++++++++-----------------
+ 1 file changed, 19 insertions(+), 21 deletions(-)
+
+diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
+index 2a6e35b..551e9b2 100644
+--- a/chart2/source/model/filter/XMLFilter.cxx
++++ b/chart2/source/model/filter/XMLFilter.cxx
+@@ -644,28 +644,26 @@ sal_Int32 XMLFilter::impl_Export(
+             xServiceFactory->createInstanceWithArguments(
+                 C2U("com.sun.star.comp.Svx.GraphicExportHelper"), aGraphicResolverArgs ), uno::UNO_QUERY );
+ 
+-        uno::Reference< beans::XPropertySet > xInfoSet;
++        // property map for export info set
++        comphelper::PropertyMapEntry aExportInfoMap[] =
+         {
+-            // property map for export info set
+-            comphelper::PropertyMapEntry aExportInfoMap[] =
+-            {
+-                { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0},
+-                { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+-                { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+-                { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
+-                { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
+-                { NULL, 0, 0, NULL, 0, 0 }
+-            };
+-
+-            xInfoSet = comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) );
+-
+-            SvtSaveOptions aSaveOpt;
+-            OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting"));
+-            sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
+-            xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) );
+-            if( ! bOasis )
+-                xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true ));
+-        }
++            { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0},
++            { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
++            { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
++            { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
++            { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
++            { NULL, 0, 0, NULL, 0, 0 }
++        };
++
++        uno::Reference< beans::XPropertySet > xInfoSet =
++            comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) );
++
++        SvtSaveOptions aSaveOpt;
++        OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting"));
++        sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
++        xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) );
++        if( ! bOasis )
++            xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true ));
+ 
+         sal_Int32 nArgs = 2;
+         if( xGraphicObjectResolver.is())
+-- 
+1.8.0.2
+
diff --git a/libreoffice.changes b/libreoffice.changes
index 495b5e3..51851e4 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 25 10:17:26 UTC 2013 - pmladek@suse.com
+
+- do-not-delete-PropertyMapEntry-instance.diff: lost charts (bnc#798271)
+
 -------------------------------------------------------------------
 Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 9247e6a..ff8ef92 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -635,6 +635,8 @@ Patch17:        pack-addressbook.diff
 # add pyuno to python path
 # FIXME: related to system-python-ure-bootstrap.diff
 Patch18:        pyuno-path.diff
+# lost charts (bcn#798271)
+Patch19:        do-not-delete-PropertyMapEntry-instance.diff
 #
 # default to MS Office 97/2000/XP file formats on MeeGo; asked by HP
 Patch900:       officecfg-defaul-export-ms-file-formats.diff
@@ -1348,6 +1350,7 @@ the LibreOffice localizations separately.
 %patch16 -p1
 %patch17
 %patch18
+%patch19 -p1
 #
 %if 0%{?meego_version}
 # default to MS Office 97/2000/XP file formats on MeeGo; asked by HP