From c311a43449474398f83a11107cce7b4899a01fd4084b72bd8d9a181f9691863d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 6 Apr 2018 14:52:02 +0000 Subject: [PATCH 01/15] - Switch to memory-constraints macros to limit threads as needed - Enable LTO on libreoffice, 16% smaller binaries, less memory used: * 0001-Use-jobserver-on-LTO-from-make.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=629 --- 0001-Use-jobserver-on-LTO-from-make.patch | 33 +++++++++++++++++++++++ libreoffice.changes | 7 +++++ libreoffice.spec | 25 +++++------------ 3 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 0001-Use-jobserver-on-LTO-from-make.patch diff --git a/0001-Use-jobserver-on-LTO-from-make.patch b/0001-Use-jobserver-on-LTO-from-make.patch new file mode 100644 index 0000000..c8310c3 --- /dev/null +++ b/0001-Use-jobserver-on-LTO-from-make.patch @@ -0,0 +1,33 @@ +From c87570aad9f4675f2bba9233f12f53d9fa287c51 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Fri, 6 Apr 2018 16:33:39 +0200 +Subject: [PATCH] Use jobserver on LTO from make + +This should avoid executing PARALELISM threads for each linker call but +rather limits it to the basic jobs given to make. + +Previous behaviour could be 8 make threads, each spawning 8 LTO threads, +while here it should append its jobs to make and leave it to the make +itself to distribute. + +Change-Id: Ib22bd21dfae60eb0eb8ac7b9c1c277b152378294 +--- + solenv/gbuild/platform/com_GCC_defs.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk +index ac3cbc366cf7..4180144bdec4 100644 +--- a/solenv/gbuild/platform/com_GCC_defs.mk ++++ b/solenv/gbuild/platform/com_GCC_defs.mk +@@ -158,7 +158,7 @@ ifeq ($(COM_IS_CLANG),TRUE) + gb_LTOFLAGS := -flto + gb_LTOPLUGINFLAGS := --plugin LLVMgold.so + else +-gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2 ++gb_LTOFLAGS := -flto=jobserver -fuse-linker-plugin -O2 + endif + endif + +-- +2.16.3 + diff --git a/libreoffice.changes b/libreoffice.changes index 1e23485..ee6075e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 6 14:27:40 UTC 2018 - tchvatal@suse.com + +- Switch to memory-constraints macros to limit threads as needed +- Enable LTO on libreoffice, 16% smaller binaries, less memory used: + * 0001-Use-jobserver-on-LTO-from-make.patch + ------------------------------------------------------------------- Tue Apr 3 12:26:41 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 05aeea1..9a6a275 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -97,6 +97,8 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch Patch7: bnc1039203.patch # LO-L3: Slide with chart has some strange (too large?) elements (PPTX) Patch8: bnc1060128.patch +# Upstream! this uses jobserver instead of PARALELISM for LTO +Patch9: 0001-Use-jobserver-on-LTO-from-make.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -140,6 +142,7 @@ BuildRequires: libserializer BuildRequires: libtool BuildRequires: lpsolve-devel BuildRequires: make +BuildRequires: memory-constraints BuildRequires: neon-devel >= 0.26.0 BuildRequires: openldap2-devel BuildRequires: pentaho-libxml @@ -883,6 +886,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch5 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) @@ -913,23 +917,7 @@ lo_jobs="%{?jobs:%{jobs}}" %endif %endif # do not eat all memory -echo "Available memory:" -cat /proc/meminfo -echo "System limits:" -ulimit -a -lo_jobs_reduced= -if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - mem_per_process=1200000 - max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) - 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" - test "$lo_jobs" -le 0 && lo_jobs=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits" -fi -# finally set jobs -PARALLEL_BUILD= -if test -n "$lo_jobs" ; then - PARALLEL_BUILD="--with-parallelism=$lo_jobs" -fi +%limit_build -m 1200 # make sure that JAVA_HOME is set correctly source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ... @@ -954,8 +942,9 @@ google_default_client_secret="KDTRKEZk2jwT_7CDpcmMA--P" export NOCONFIGURE=yes ./autogen.sh %configure \ - $PARALLEL_BUILD \ + --with-parallelism=%{jobs} \ --enable-eot \ + --enable-lto \ --enable-mergelibs \ --docdir=%{_docdir}/%{name} \ --with-compat-oowrappers \ From ac8daa3497c9905f8513d2d1cbe3f682511cd5511842d1d26aecd51a52296b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 6 Apr 2018 15:19:52 +0000 Subject: [PATCH 02/15] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=630 --- 0001-Use-jobserver-on-LTO-from-make.patch | 33 ----------------------- libreoffice.changes | 1 - libreoffice.spec | 3 --- 3 files changed, 37 deletions(-) delete mode 100644 0001-Use-jobserver-on-LTO-from-make.patch diff --git a/0001-Use-jobserver-on-LTO-from-make.patch b/0001-Use-jobserver-on-LTO-from-make.patch deleted file mode 100644 index c8310c3..0000000 --- a/0001-Use-jobserver-on-LTO-from-make.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c87570aad9f4675f2bba9233f12f53d9fa287c51 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Fri, 6 Apr 2018 16:33:39 +0200 -Subject: [PATCH] Use jobserver on LTO from make - -This should avoid executing PARALELISM threads for each linker call but -rather limits it to the basic jobs given to make. - -Previous behaviour could be 8 make threads, each spawning 8 LTO threads, -while here it should append its jobs to make and leave it to the make -itself to distribute. - -Change-Id: Ib22bd21dfae60eb0eb8ac7b9c1c277b152378294 ---- - solenv/gbuild/platform/com_GCC_defs.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk -index ac3cbc366cf7..4180144bdec4 100644 ---- a/solenv/gbuild/platform/com_GCC_defs.mk -+++ b/solenv/gbuild/platform/com_GCC_defs.mk -@@ -158,7 +158,7 @@ ifeq ($(COM_IS_CLANG),TRUE) - gb_LTOFLAGS := -flto - gb_LTOPLUGINFLAGS := --plugin LLVMgold.so - else --gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2 -+gb_LTOFLAGS := -flto=jobserver -fuse-linker-plugin -O2 - endif - endif - --- -2.16.3 - diff --git a/libreoffice.changes b/libreoffice.changes index ee6075e..7aa7c1e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -3,7 +3,6 @@ Fri Apr 6 14:27:40 UTC 2018 - tchvatal@suse.com - Switch to memory-constraints macros to limit threads as needed - Enable LTO on libreoffice, 16% smaller binaries, less memory used: - * 0001-Use-jobserver-on-LTO-from-make.patch ------------------------------------------------------------------- Tue Apr 3 12:26:41 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 9a6a275..80cf234 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -97,8 +97,6 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch Patch7: bnc1039203.patch # LO-L3: Slide with chart has some strange (too large?) elements (PPTX) Patch8: bnc1060128.patch -# Upstream! this uses jobserver instead of PARALELISM for LTO -Patch9: 0001-Use-jobserver-on-LTO-from-make.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -886,7 +884,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch5 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) From a15292da4e754d0ca078558499debe5dbca19f5b55130dbaacdccb07fb3f3d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Apr 2018 08:31:08 +0000 Subject: [PATCH 03/15] - Add patch to disable test failing with LTO: * libreoffice-lto-failtest.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=632 --- libreoffice-lto-failtest.patch | 20 ++++++++++++++++++++ libreoffice.changes | 6 ++++++ libreoffice.spec | 3 +++ 3 files changed, 29 insertions(+) create mode 100644 libreoffice-lto-failtest.patch diff --git a/libreoffice-lto-failtest.patch b/libreoffice-lto-failtest.patch new file mode 100644 index 0000000..eb8d967 --- /dev/null +++ b/libreoffice-lto-failtest.patch @@ -0,0 +1,20 @@ +diff --git a/dictionaries b/dictionaries +index c8e86617a771..f2a8f86e8b90 160000 +--- a/dictionaries ++++ b/dictionaries +@@ -1 +1 @@ +-Subproject commit c8e86617a771c53813a86d64bd3467aa75c63307 ++Subproject commit f2a8f86e8b9066b244a65b5944a4d6d4ef24b04c-dirty +diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk +index 8fb2836f70e6..9036e8940d94 100644 +--- a/sw/Module_sw.mk ++++ b/sw/Module_sw.mk +@@ -53,8 +53,6 @@ $(eval $(call gb_Module_add_check_targets,sw,\ + )) + + $(eval $(call gb_Module_add_slowcheck_targets,sw,\ +- $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ +- CppunitTest_sw_uwriter) \ + CppunitTest_sw_docbookexport \ + CppunitTest_sw_fodfexport \ + CppunitTest_sw_htmlexport \ diff --git a/libreoffice.changes b/libreoffice.changes index 7aa7c1e..0242637 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 9 08:30:30 UTC 2018 - tchvatal@suse.com + +- Add patch to disable test failing with LTO: + * libreoffice-lto-failtest.patch + ------------------------------------------------------------------- Fri Apr 6 14:27:40 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 80cf234..bc33ed9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -97,6 +97,8 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch Patch7: bnc1039203.patch # LO-L3: Slide with chart has some strange (too large?) elements (PPTX) Patch8: bnc1060128.patch +# PATCH-FIX-UPSTREAM disable test failing with LTO +Patch9: libreoffice-lto-failtest.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -884,6 +886,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch5 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) From 1e622898a04406ace01d95a245a03948c197520f3a4e979464594c58080d1d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Apr 2018 08:34:09 +0000 Subject: [PATCH 04/15] - Enable LTO on libreoffice, 16% smaller binaries, less memory used OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=633 --- libreoffice.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 0242637..8fcffb0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -8,7 +8,7 @@ Mon Apr 9 08:30:30 UTC 2018 - tchvatal@suse.com Fri Apr 6 14:27:40 UTC 2018 - tchvatal@suse.com - Switch to memory-constraints macros to limit threads as needed -- Enable LTO on libreoffice, 16% smaller binaries, less memory used: +- Enable LTO on libreoffice, 16% smaller binaries, less memory used ------------------------------------------------------------------- Tue Apr 3 12:26:41 UTC 2018 - tchvatal@suse.com From 483a4ef30682808ab3a04a43db85891bf2deff9523d0b8428d061ddeec77e47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Apr 2018 14:21:10 +0000 Subject: [PATCH 05/15] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=634 --- libreoffice-lto-failtest.patch | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libreoffice-lto-failtest.patch b/libreoffice-lto-failtest.patch index eb8d967..08de4e7 100644 --- a/libreoffice-lto-failtest.patch +++ b/libreoffice-lto-failtest.patch @@ -1,10 +1,3 @@ -diff --git a/dictionaries b/dictionaries -index c8e86617a771..f2a8f86e8b90 160000 ---- a/dictionaries -+++ b/dictionaries -@@ -1 +1 @@ --Subproject commit c8e86617a771c53813a86d64bd3467aa75c63307 -+Subproject commit f2a8f86e8b9066b244a65b5944a4d6d4ef24b04c-dirty diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 8fb2836f70e6..9036e8940d94 100644 --- a/sw/Module_sw.mk From e235fa93d43a6e08b39ae0fa327e4ab096db4f42c6920c03c74b99eae3336311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Apr 2018 17:25:43 +0000 Subject: [PATCH 06/15] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=635 --- libreoffice-lto-failtest.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libreoffice-lto-failtest.patch b/libreoffice-lto-failtest.patch index 08de4e7..56a88c6 100644 --- a/libreoffice-lto-failtest.patch +++ b/libreoffice-lto-failtest.patch @@ -1,9 +1,9 @@ -diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk -index 8fb2836f70e6..9036e8940d94 100644 ---- a/sw/Module_sw.mk -+++ b/sw/Module_sw.mk -@@ -53,8 +53,6 @@ $(eval $(call gb_Module_add_check_targets,sw,\ - )) +Index: libreoffice-6.0.3.2/sw/Module_sw.mk +=================================================================== +--- libreoffice-6.0.3.2.orig/sw/Module_sw.mk ++++ libreoffice-6.0.3.2/sw/Module_sw.mk +@@ -49,8 +49,6 @@ $(eval $(call gb_Module_add_targets,sw,\ + endif $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ From 6b8b2ea46c0276adda95ca6adcf95865931f334be1e6dbf5e567da367bc9d364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 10 Apr 2018 11:01:15 +0000 Subject: [PATCH 07/15] - Use gpg keys to verify downloaded archives OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=636 --- libreoffice-6.0.3.2.tar.xz.asc | 16 +++++++ libreoffice-help-6.0.3.2.tar.xz.asc | 16 +++++++ libreoffice-translations-6.0.3.2.tar.xz.asc | 16 +++++++ libreoffice.changes | 5 ++ libreoffice.keyring | 51 +++++++++++++++++++++ libreoffice.spec | 14 ++++-- 6 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 libreoffice-6.0.3.2.tar.xz.asc create mode 100644 libreoffice-help-6.0.3.2.tar.xz.asc create mode 100644 libreoffice-translations-6.0.3.2.tar.xz.asc create mode 100644 libreoffice.keyring diff --git a/libreoffice-6.0.3.2.tar.xz.asc b/libreoffice-6.0.3.2.tar.xz.asc new file mode 100644 index 0000000..9c7a775 --- /dev/null +++ b/libreoffice-6.0.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJavQd9AAoJEPQ0oe+v7q6jPzoP+gJSoOVKHM8+6fvInqFZx/Qn +Gr3AvPP04etYNR/GQBQRRKeoqTZpoCxjk1gw9QgmNlO6YMphVktFXZdPTxSbT5bp +vTF/Pb9JGFpOwE0rYXR6fnF5GeLYFhc+Li5Ky/MiAq5jsDZBrvQNCrxlowYi6v3a +V+TBXb/CBlcl3BJ/fUDsSnWDH/yaPPF3zwqUP65DUCiXFu8vEQC2mXpBAUNQQFEx +NM6jOfndIWESYIu/6YmWNwtcWYCfhyzpuzCiW8eTtv/uByzyM4WMRqYRfqXGeqxT +dUr0JTy9sd/yL9HSZY/T11mGJ+t0G8FmeB5Db82OkPefZnSMQKg8eAyNuNsbMLfP +oUCgua+SsjqFApagxKu9+vhc24I9TivyYOL/a5PF3skGGS5lNvcjtfiavkc/GXOj +UgeAeznnasuIYrVh5yI6HKUyRmNkUbllz6pNq71OIXArMe+K5w0uQGBH2PJByioI +VjiRdPafKAv1fGto9a4b9icAhs5FZ25z3GxkgfOoBAgxCpAEWbLqj8+sOqS9rb99 +wjZuuaqWpwG8XUODNkkKlIMIxw880kySr6FwNM8Ug9to668juoNtcWERhJQDmy0V +H6MxasMN+B93+nv+0eQoLFwFKWD7Phevch1fqfTD/JYXGu6Wp/SNvlh40F3VEVrn +ZcvLwDjluD7VX5dpDi/J +=PHH2 +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-6.0.3.2.tar.xz.asc b/libreoffice-help-6.0.3.2.tar.xz.asc new file mode 100644 index 0000000..5118789 --- /dev/null +++ b/libreoffice-help-6.0.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJavQeHAAoJEPQ0oe+v7q6jmuoP/jlGZgVLrWO8ib3OoGRdJDzn +c1xrfIBuw+4IWSzPRktw27U/DPdDhv9ydTCuZEnWhwLR5MbYYDiBXo+XQe8tIWC7 +cvEvJx+E4JbCCuc4tQrQeM1ZyOIQ6tK0Ncr3RDioxHenko+JVNYlZnfId7IA8My2 +cACPPmFpgIg0oyXd+RtEGxRe6lG4BJa7EBqSf3hhjk1w/ym79BV1JezMwNnwgzKg +rYJeCMh1ZMvj72GF3DH2ucIqtNiRAvTTChEc7lfySR4hDqtZi5MY6sGR7Vk7N+A2 +/vol0vizY0wlB1BUsvhm8rQDjReM1zhlvrVv58A+C5IuD0F6eoH6qD9FJcI4b5c9 +hI9hV3+xafxo53hvvHcmMkoXO20gxNHiTBdORUau2BRXya+lkzkaiXsFV9lTe5tR +80sp7MQIAgAOhxMZDj+IkNu6S56hl4QUsOGrHZ+7m4MQ9od7ODQRnxhGV6rq3P0O +br6T9tyD/j9BybOeP7AKp7fXLoZuNzG9qfIzJ+Kicrjbj18nM+A5s45IV+ZQRT7c +Y8gDUTlTJtQoDjg5B3yGaQz7TIEk0MXb4VMskDJ+/wxyviobIO7jRmjTj9cD+Hzh +QrX+/5PSPAsLTQkJX2U/pCJJl12M0pbeQ8ccfOrxU6FqV1muX5YmrlYh6JkfDD5U +L3NAfbBliU8enm7D9n5t +=RRdV +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.0.3.2.tar.xz.asc b/libreoffice-translations-6.0.3.2.tar.xz.asc new file mode 100644 index 0000000..715e9dc --- /dev/null +++ b/libreoffice-translations-6.0.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJavQeLAAoJEPQ0oe+v7q6jfdsQAK68sI5iIuRTHWbfP3c2wDJg +mb37owUyC2k++4W3pz7U0SSroGwoymtPH6s3ZH0utBuo6cNPZ7Ema8Aucr7BD9x+ +ByDL5JlYU/uOPN0nPw2FNnMQZgdJOS9RulpI9ZGGJwISzjUCoD8LRBNvhW1/LmBN +alFBoLOqqoUL0qL3iFD41VRQrEEoLH2mnSfoWqITnh9EWNpVpZrXrjAYLJSgh2K3 +oHrb23M6EDN25o5flm7hmdY2bZOvofh45PpXsngxAtYqVRMYQtO/wHwylG95Xcw9 +1njWXsk3HL+z3H+Ic1GWLGyvumA9IoeS/ZCgxtjWGlvu1T7PRea+opx/gPjWEqUq +ipI7UWS6gQLWf9OiaWQ0Z/UK6FIOnv4Daig/GEmxkZ5R7VRFO7pu4f3NA/z0ilzs +/0H50HVP6Y9E9fah+30FniiS2+RuT7WfuBbgmAwbYdIUyxBXRCHmgkc2fMiHTFcz +7Qeir9x1r+RwCVcxCZ/2IVUu7O1H18kXecBP/nn79adFS4HRNBfcQrWIKQlQCeiq +ZZebVS7Qg8aXgIPOiZ5JXwjuFCMVwIbgLMc4KC6HSrLLZYRfz+9nBYa3j0pDX9rP +yuPZyP8krGrZ6buhPzaKIeYNXoKjeeDLmjFV7zIDWp9mpDWfXIn9zgbw83GfXH7v +R4aohL1cK3AoUOA+z27E +=a9wg +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 8fcffb0..5721119 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 10 11:00:15 UTC 2018 - tchvatal@suse.com + +- Use gpg keys to verify downloaded archives + ------------------------------------------------------------------- Mon Apr 9 08:30:30 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.keyring b/libreoffice.keyring new file mode 100644 index 0000000..fd0c74b --- /dev/null +++ b/libreoffice.keyring @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=1iQB +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libreoffice.spec b/libreoffice.spec index bc33ed9..864a295 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -55,10 +55,14 @@ License: LGPL-3.0-or-later AND MPL-2.0+ Group: Productivity/Office/Suite URL: http://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz -Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz -Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz +Source1: %{tarball_url}/libreoffice-%{version}.tar.xz.asc +Source2: %{tarball_url}/libreoffice-help-%{version}.tar.xz +Source3: %{tarball_url}/libreoffice-help-%{version}.tar.xz.asc +Source4: %{tarball_url}/libreoffice-translations-%{version}.tar.xz +Source5: %{tarball_url}/libreoffice-translations-%{version}.tar.xz.asc # SUSE color palette bsc#1045339 https://intra.microfocus.net/brandcentral/suse/identity.php#palette -Source3: SUSE.soc +Source6: SUSE.soc +Source98: %{name}.keyring Source99: %{name}-rpmlintrc # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt @@ -875,7 +879,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %langpack -l zu -n Zulu -m zu_ZA %prep -%setup -q -b1 -b2 +%setup -q -b2 -b4 %if 0%{?suse_version} < 1330 # The rename of the configdir is needed only on older than factory for compat %patch1 @@ -1216,7 +1220,7 @@ done rm pyfiles.txt # Install color palette -cp %{SOURCE3} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc +cp %{SOURCE6} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.txt %if %{with gtk3} From f25594fb8d9aeef42a3103eaf7ee1a66b499889f123f574c88abf562e5cda564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 11 Apr 2018 07:49:24 +0000 Subject: [PATCH 08/15] - Provide and obsolete also libreoffice-branding-SLE - Use pkgconfig(libpg) instead of posgresql-devel dependency - Bring back offline help per popular demand as lto saves space we could use with it bsc#915996 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=637 --- libreoffice.changes | 16 +++++++ libreoffice.spec | 105 +++++++++++++++++++++++--------------------- 2 files changed, 72 insertions(+), 49 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 5721119..c8ef548 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Apr 11 07:47:35 UTC 2018 - tchvatal@suse.com + +- Provide and obsolete also libreoffice-branding-SLE + +------------------------------------------------------------------- +Wed Apr 11 06:01:49 UTC 2018 - tchvatal@suse.com + +- Use pkgconfig(libpg) instead of posgresql-devel dependency + +------------------------------------------------------------------- +Tue Apr 10 11:27:05 UTC 2018 - tchvatal@suse.com + +- Bring back offline help per popular demand as lto saves space + we could use with it bsc#915996 + ------------------------------------------------------------------- Tue Apr 10 11:00:15 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 864a295..365d8ad 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -152,7 +152,6 @@ BuildRequires: openldap2-devel BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine BuildRequires: pkgconfig -BuildRequires: postgresql-devel BuildRequires: python3-xml BuildRequires: sac BuildRequires: ucpp @@ -197,6 +196,7 @@ BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.13 BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 BuildRequires: pkgconfig(liborcus-0.13) BuildRequires: pkgconfig(libpagemaker-0.0) +BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) @@ -309,11 +309,13 @@ example: %package branding-upstream Summary: Original Branding for LibreOffice Group: Productivity/Office/Suite -Supplements: packageand(libreoffice:branding-upstream) +Supplements: libreoffice Conflicts: libreoffice-branding Provides: libreoffice-branding = %{version} Provides: libreoffice-branding-openSUSE = 4.0.1 Obsoletes: libreoffice-branding-openSUSE < 4.0.1 +Provides: libreoffice-branding-SLE = 4.0.1 +Obsoletes: libreoffice-branding-SLE < 4.0.1 BuildArch: noarch %description branding-upstream @@ -747,12 +749,13 @@ fi \ # S:s: script classification (cjk, ctl). -S is only a marker, as it does # not add any .xcd into the package (the file does not exist for at # least one CTL-using locale, si) +# T has help files # Xx: has autotext definitions # # Example: # libreoffice-l10n-cs: langpack for Czech lang. Requiring myspell-cs_CZ: # %%langpack -l cs -n Czech -m cs_CZ -%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:Xx:) \ +%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:TXx:) \ %define project LibreOffice \ %define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ %define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \ @@ -796,6 +799,10 @@ Obsoletes: %{name}-help-%{-q*} < %{version} \ Provides additional %{langname} translations and resources for %{project}. \ \ %files %{pkgname} \ +%{-T: \ +%dir %{_datadir}/libreoffice/help/%{_langpack_lang} \ +%{_datadir}/libreoffice/help/%{_langpack_lang} \ +}\ %{!-E: \ %define autotextdir %{_datadir}/%{name}/share/autotext \ %dir %{autotextdir} \ @@ -809,73 +816,73 @@ Provides additional %{langname} translations and resources for %{project}. \ %{expand:%%_link_noarch_files %{pkgname}} \ %{nil} %langpack -l af -n Afrikaans -m af_ZA -%langpack -l ar -n Arabic -s ctl -m ar +%langpack -l ar -n Arabic -s ctl -m ar -T %langpack -l as -n Assamese -%langpack -l bg -n Bulgarian -X -m bg_BG -%langpack -l bn -n Bengali -m bn_BD +%langpack -l bg -n Bulgarian -X -m bg_BG -T +%langpack -l bn -n Bengali -m bn_BD -T %langpack -l br -n Breton -m br_FR -%langpack -l ca -n Catalan -M -X -%langpack -l cs -n Czech -X -m cs_CZ +%langpack -l ca -n Catalan -M -X -T +%langpack -l cs -n Czech -X -m cs_CZ -T %langpack -l cy -n Welsh -%langpack -l da -n Danish -X -m da_DK -%langpack -l de -n German -X -M -%langpack -l dz -n Dzongkha -s ctl -%langpack -l el -n Greek -m el_GR -%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M -g en_US -%langpack -l eo -n Esperanto -%langpack -l es -n Spanish -M -X -%langpack -l et -n Estonian -m et_EE -%langpack -l eu -n Basque +%langpack -l da -n Danish -X -m da_DK -T +%langpack -l de -n German -X -M -T +%langpack -l dz -n Dzongkha -s ctl -T +%langpack -l el -n Greek -m el_GR -T +%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M -g en_US -T +%langpack -l eo -n Esperanto -T +%langpack -l es -n Spanish -M -X -T +%langpack -l et -n Estonian -m et_EE -T +%langpack -l eu -n Basque -T %langpack -l fa -n Farsi -s ctl -X -%langpack -l fi -n Finnish -r libreoffice-voikko -X -%langpack -l fr -n French -X -m fr_FR +%langpack -l fi -n Finnish -r libreoffice-voikko -X -T +%langpack -l fr -n French -X -m fr_FR -T %langpack -l ga -n Irish -%langpack -l gl -n Galician -M -%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -%langpack -l he -n Hebrew -s ctl -m he_IL -%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -%langpack -l hr -n Croatian -m hr_HR -X -%langpack -l hu -n Hungarian -X -m hu_HU -%langpack -l it -n Italian -X -m it_IT -%langpack -l ja -n Japanese -s cjk -X +%langpack -l gl -n Galician -M -T +%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -T +%langpack -l he -n Hebrew -s ctl -m he_IL -T +%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -T +%langpack -l hr -n Croatian -m hr_HR -X -T +%langpack -l hu -n Hungarian -X -m hu_HU -T +%langpack -l it -n Italian -X -m it_IT -T +%langpack -l ja -n Japanese -s cjk -X -T %langpack -l kk -n Kazakh %langpack -l kn -n Kannada -%langpack -l ko -n Korean -s cjk -X -%langpack -l lt -n Lithuanian -m lt_LT -X -%langpack -l lv -n Latvian -m lv_LV +%langpack -l ko -n Korean -s cjk -X -T +%langpack -l lt -n Lithuanian -m lt_LT -X -T +%langpack -l lv -n Latvian -m lv_LV -T %langpack -l mai -n Maithili %langpack -l ml -n Malayalam %langpack -l mr -n Marathi -%langpack -l nb -n Bokmal -M -m no -%langpack -l nl -n Dutch -X -m nl_NL -%langpack -l nn -n Nynorsk -m no +%langpack -l nb -n Bokmal -M -m no -T +%langpack -l nl -n Dutch -X -m nl_NL -T +%langpack -l nn -n Nynorsk -m no -T %langpack -l nr -n Southern_Ndebele %langpack -l nso -n Northern_Sotho %langpack -l or -n Odia -s ctl %langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN -%langpack -l pl -n Polish -X -m pl_PL -%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X -g pt_BR -j pt_BR -%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT -%langpack -l ro -n Romanian -M -X -%langpack -l ru -n Russian -X -m ru_RU -%langpack -l si -n Sinhalese -S ctl -m si_LK -%langpack -l sk -n Slovak -X -m sk_SK -%langpack -l sl -n Slovenian -X -m sl_SI +%langpack -l pl -n Polish -X -m pl_PL -T +%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X -g pt_BR -j pt_BR -T +%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT -T +%langpack -l ro -n Romanian -M -X -T +%langpack -l ru -n Russian -X -m ru_RU -T +%langpack -l si -n Sinhalese -S ctl -m si_LK -T +%langpack -l sk -n Slovak -X -m sk_SK -T +%langpack -l sl -n Slovenian -X -m sl_SI -T %langpack -l sr -n Serbian -i sr-Latn -M -j sr_Latn -g sr -k sr@latin %langpack -l ss -n Swati %langpack -l st -n Southern_Sotho -%langpack -l sv -n Swedish -X -m sv_SE -%langpack -l ta -n Tamil -s ctl +%langpack -l sv -n Swedish -X -m sv_SE -T +%langpack -l ta -n Tamil -s ctl -T %langpack -l te -n Telugu -m te_IN %langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH %langpack -l tn -n Tswana -%langpack -l tr -n Turkish -X +%langpack -l tr -n Turkish -X -T %langpack -l ts -n Tsonga -%langpack -l uk -n Ukrainian -m uk_UA +%langpack -l uk -n Ukrainian -m uk_UA -T %langpack -l ve -n Venda %langpack -l xh -n Xhosa -%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans -g zh_CN -j zh_CN -%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant -g zh_TW -j zh_TW +%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans -g zh_CN -j zh_CN -T +%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant -g zh_TW -j zh_TW -T %langpack -l zu -n Zulu -m zu_ZA %prep @@ -991,8 +998,7 @@ export NOCONFIGURE=yes --with-external-dict-dir=%{_datadir}/hunspell \ --with-external-hyph-dir=%{_datadir}/hyphen \ --with-external-thes-dir=%{_datadir}/mythes \ - --without-helppack-integration \ - --without-help \ + --with-help \ --without-export-validation \ --enable-odk \ %if %{with kdeintegration} @@ -1440,6 +1446,7 @@ exit 0 %{_datadir}/%{name}/share/config/images_sifr.zip %{_datadir}/%{name}/share/config/images_sifr_dark.zip %{_datadir}/%{name}/share/config/images_tango.zip +%{_datadir}/%{name}/share/config/images_helpimg.zip %files -f file-lists/branding_upstream.txt branding-upstream From da055e4f918d82bfe6eb5fa317486b3e4dbaac4d6d39abce762d0cf736676459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 11 Apr 2018 07:50:21 +0000 Subject: [PATCH 09/15] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=638 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 365d8ad..24dfca6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -530,7 +530,7 @@ Supplements: packageand(libreoffice:plasma5-workspace) This package contains Gtk2 interface rendering option for LibreOffice. %package kde4 -Summary: kde4 interface for LibreOffice +Summary: KDE4 interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} # we need full kdelibs4 otherwise we will crash From 21c9e05385177448adeb3ed8ad40f1f47d8d8c7b0f9323bc94225e2c87ca6bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 11 Apr 2018 11:24:23 +0000 Subject: [PATCH 10/15] - Update patch to not call python directly during help generating: * 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=639 --- ...UILD-instead-of-calling-python-direc.patch | 37 +++++++++++++++++++ libreoffice.changes | 2 + 2 files changed, 39 insertions(+) diff --git a/0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch b/0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch index b606d3e..4d1e033 100644 --- a/0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch +++ b/0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch @@ -38,3 +38,40 @@ index 5dbd0038f009..112be23c9ce8 100644 -- 2.16.1 +From 76635096e9c9832d856e8eb1798ce70256f6d81b Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Fri, 23 Feb 2018 08:43:00 +0100 +Subject: Adapt CustomTarget_helpcontent2/source/auxiliary + +...to core 906a2e4fa4e9ce231126c608e741c0c0d809157d "Always execute +pack_images.py with the right Python interpreter" + +Change-Id: I7c6c9aed33222fb5b902e30a05cefe8f88c66df1 +--- + CustomTarget_imagelist.mk | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +(limited to 'CustomTarget_imagelist.mk') + +diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk +index f0710e6..099bebe 100644 +--- a/helpcontent2/CustomTarget_imagelist.mk ++++ b/helpcontent2/CustomTarget_imagelist.mk +@@ -19,11 +19,12 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\ + + $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg.zip : \ + $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst \ +- $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst ++ $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst \ ++ | $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Helper_abbreviate_dirs, \ + ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ +- $(PYTHON) $(SRCDIR)/solenv/bin/pack_images.py \ ++ $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/pack_images.py \ + -g $(helpmedia_DIR) -m $(helpmedia_DIR) -c $(helpmedia_DIR) \ + -l $${ILSTFILE} \ + -s $< -o $@ \ +-- +cgit v1.1 + diff --git a/libreoffice.changes b/libreoffice.changes index c8ef548..df08916 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -13,6 +13,8 @@ Tue Apr 10 11:27:05 UTC 2018 - tchvatal@suse.com - Bring back offline help per popular demand as lto saves space we could use with it bsc#915996 +- Update patch to not call python directly during help generating: + * 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch ------------------------------------------------------------------- Tue Apr 10 11:00:15 UTC 2018 - tchvatal@suse.com From ba69032723e68b95f144e20e77af8ad5b277b9e45fa4567b93b922ab91905903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 12 Apr 2018 07:58:10 +0000 Subject: [PATCH 11/15] - Drop patch libreoffice-lto-failtest.patch as the problem was with memcpy in wrong phases, fixed by cflag -flifetime-dse=1 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=640 --- libreoffice-lto-failtest.patch | 13 ------------- libreoffice.changes | 6 ++++++ libreoffice.spec | 9 +++------ 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 libreoffice-lto-failtest.patch diff --git a/libreoffice-lto-failtest.patch b/libreoffice-lto-failtest.patch deleted file mode 100644 index 56a88c6..0000000 --- a/libreoffice-lto-failtest.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libreoffice-6.0.3.2/sw/Module_sw.mk -=================================================================== ---- libreoffice-6.0.3.2.orig/sw/Module_sw.mk -+++ libreoffice-6.0.3.2/sw/Module_sw.mk -@@ -49,8 +49,6 @@ $(eval $(call gb_Module_add_targets,sw,\ - endif - - $(eval $(call gb_Module_add_slowcheck_targets,sw,\ -- $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ -- CppunitTest_sw_uwriter) \ - CppunitTest_sw_docbookexport \ - CppunitTest_sw_fodfexport \ - CppunitTest_sw_htmlexport \ diff --git a/libreoffice.changes b/libreoffice.changes index df08916..065f870 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 12 07:57:17 UTC 2018 - tchvatal@suse.com + +- Drop patch libreoffice-lto-failtest.patch as the problem was with + memcpy in wrong phases, fixed by cflag -flifetime-dse=1 + ------------------------------------------------------------------- Wed Apr 11 07:47:35 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 24dfca6..04f5031 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -101,8 +101,6 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch Patch7: bnc1039203.patch # LO-L3: Slide with chart has some strange (too large?) elements (PPTX) Patch8: bnc1060128.patch -# PATCH-FIX-UPSTREAM disable test failing with LTO -Patch9: libreoffice-lto-failtest.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -897,7 +895,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch5 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) @@ -933,9 +930,9 @@ lo_jobs="%{?jobs:%{jobs}}" source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ... # remove big debugsymbols as we simply consume too much space -ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" -CFLAGS="$ARCH_FLAGS" -CXXFLAGS="$ARCH_FLAGS" +ARCH_FLAGS="`echo %{optflags} -flifetime-dse=1 | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" +CFLAGS="$ARCH_FLAGS -flifetime-dse=1" +CXXFLAGS="$ARCH_FLAGS -flifetime-dse=1" export ARCH_FLAGS CFLAGS CXXFLAGS # Colada does not have .pc file and configure creator was really lazy From 609982ef48a2443cad29bd5325351e07cfe08b2b89129b817e217d459cc7a2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 13 Apr 2018 10:50:25 +0000 Subject: [PATCH 12/15] - Provide and obsolete all the gtk3 disabled stuff if we disable gtk3 to ease migration OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=641 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 065f870..9857fb7 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 13 10:49:46 UTC 2018 - tchvatal@suse.com + +- Provide and obsolete all the gtk3 disabled stuff if we disable + gtk3 to ease migration + ------------------------------------------------------------------- Thu Apr 12 07:57:17 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 04f5031..55abcfb 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -250,6 +250,13 @@ ExclusiveArch: aarch64 %{ix86} x86_64 %if %{with gtk3} BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(gtk+-3.0) +%else +Provides: libreofficekit = %{version} +Obsoletes: libreofficekit < %{version} +Provides: libreofficekit-devel = %{version} +Obsoletes: libreofficekit-devel < %{version} +Provides: %{name}-gtk3 = %{version} +Obsoletes: %{name}-gtk3 < %{version} %endif %if %{with system_gpgme} BuildRequires: libgpgmepp-devel From 52809fe7408fd32eb04bcbc5a1e1d07375490bf360f3086b281c7722c0d83d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 13 Apr 2018 10:55:17 +0000 Subject: [PATCH 13/15] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=642 --- libreoffice.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 55abcfb..d92dcd6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -923,14 +923,6 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile %build -# Parallel build settings ... -lo_jobs="%{?jobs:%{jobs}}" -%ifarch %{arm} - %if ! 0%{?qemu_user_space_build:1} - # native hardware is not that powerful - lo_jobs="1" - %endif -%endif # do not eat all memory %limit_build -m 1200 # make sure that JAVA_HOME is set correctly From dbefb2ac593f5885c52bb4faeb4867b66488e889601bb99561996caf974dfa34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Apr 2018 13:21:31 +0000 Subject: [PATCH 14/15] * Also fixes bsc#1089705 CVE-2018-10119 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=643 --- libreoffice.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.changes b/libreoffice.changes index 9857fb7..e2566dd 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -177,6 +177,7 @@ Fri Feb 9 11:59:11 UTC 2018 - tchvatal@suse.com - Version update to 6.0.1.1: * various fixes all around * Fixes data exposure bsc#1080249 CVE-2018-1055 CVE-2018-6871 + * Also fixes bsc#1089705 CVE-2018-10119 - Bump the version of libgpg-error - Drop the libreoffice-poppler-0.62.patch merged upstream From 9a1cfafc139b7672640990f06dc99aeed6b4c988da781cfdda90ecff23827516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Apr 2018 13:24:30 +0000 Subject: [PATCH 15/15] * fixes bsc#1089706 CVE-2018-10120 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=644 --- libreoffice.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.changes b/libreoffice.changes index e2566dd..f7a05b5 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -126,6 +126,7 @@ Mon Mar 5 15:47:27 UTC 2018 - andras.timar@collabora.com Mon Mar 5 10:24:22 UTC 2018 - tchvatal@suse.com - Version update to 6.0.2.1 release: + * fixes bsc#1089706 CVE-2018-10120 * second bugfix release closing around 80 TDF issues -------------------------------------------------------------------