From 0f56bf47c27a687eb3aba31f4f24c7a6c92bd47bc388953cd55756cd6e18f857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Nov 2017 09:23:58 +0000 Subject: [PATCH 1/7] - Fix pyuno paths wrt bsc#1059720 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=539 --- libreoffice.changes | 5 +++++ libreoffice.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index fcf1db2..134ce87 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 2 09:24:49 UTC 2017 - tchvatal@suse.com + +- Fix pyuno paths wrt bsc#1059720 + ------------------------------------------------------------------- Thu Oct 12 10:52:03 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 8970a9f..e992e27 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1064,10 +1064,10 @@ make unset WITH_LANG # work around flawed accessibility check export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" -export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice +export OOO_TEST_SOFFICE=path:%{buildroot}%{_libdir}/libreoffice/program/soffice #timeout -k 2m 2h make smoketest.subsequentcheck # we don't need this anymore -rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar +rm -f %{buildroot}%{_libdir}/libreoffice/program/classes/smoketest.jar %endif %install @@ -1220,7 +1220,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ # Prepare uno path detection, can't be patched in because it breaks tests echo "import sys, os" > uno.py -echo "sys.path.append('%{baseinstdir}/program')" >> uno.py +echo "sys.path.append('%{_libdir}/%{name}/program')" >> uno.py echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{_libdir}/libreoffice/program/fundamentalrc')" >> uno.py cat %{buildroot}%{_libdir}/%{name}/program/uno.py >> uno.py cp uno.py %{buildroot}%{_libdir}/%{name}/program/uno.py From ff29ae96ec48259581f02ec0c03b88f229a571c6dd08f628afc5924b9165c273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Nov 2017 13:42:43 +0000 Subject: [PATCH 2/7] - Switch to bundled gpgme on old distros where it is not possible to update - Rebase scp2-user-config-suse.diff to apply again OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=540 --- gpgme-1.9.0.tar.bz2 | 3 +++ libassuan-2.4.3.tar.bz2 | 3 +++ libgpg-error-1.27.tar.bz2 | 3 +++ libreoffice.changes | 7 +++++++ libreoffice.spec | 16 ++++++++++++++++ scp2-user-config-suse.diff | 23 ++++++++++------------- 6 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 gpgme-1.9.0.tar.bz2 create mode 100644 libassuan-2.4.3.tar.bz2 create mode 100644 libgpg-error-1.27.tar.bz2 diff --git a/gpgme-1.9.0.tar.bz2 b/gpgme-1.9.0.tar.bz2 new file mode 100644 index 0000000..8fe4c80 --- /dev/null +++ b/gpgme-1.9.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb +size 1344222 diff --git a/libassuan-2.4.3.tar.bz2 b/libassuan-2.4.3.tar.bz2 new file mode 100644 index 0000000..a8e5c8e --- /dev/null +++ b/libassuan-2.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71 +size 559867 diff --git a/libgpg-error-1.27.tar.bz2 b/libgpg-error-1.27.tar.bz2 new file mode 100644 index 0000000..19c3ccd --- /dev/null +++ b/libgpg-error-1.27.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2 +size 813060 diff --git a/libreoffice.changes b/libreoffice.changes index 134ce87..f544d78 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 2 13:36:04 UTC 2017 - tchvatal@suse.com + +- Switch to bundled gpgme on old distros where it is not possible + to update +- Rebase scp2-user-config-suse.diff to apply again + ------------------------------------------------------------------- Thu Nov 2 09:24:49 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index e992e27..1d59424 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,6 +35,11 @@ %else %bcond_with firebird %endif +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%bcond_without system_gpgme +%else +%bcond_with system_gpgme +%endif Name: libreoffice Version: 5.4.2.2 Release: 0 @@ -53,6 +58,10 @@ Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu # used extensions sources Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 +# GPGME bundle list +Source1000: %{external_url}/gpgme-1.9.0.tar.bz2 +Source1001: %{external_url}/libgpg-error-1.27.tar.bz2 +Source1002: %{external_url}/libassuan-2.4.3.tar.bz2 # This never had an release so just bundle it as per what other distros do Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # Internal bundled stuff we can't remove @@ -121,7 +130,9 @@ BuildRequires: libcppunit-devel >= 1.14.0 BuildRequires: libexif BuildRequires: libfonts BuildRequires: libformula +%if %{with system_gpgme} BuildRequires: libgpgmepp-devel +%endif BuildRequires: libjpeg-devel BuildRequires: liblayout BuildRequires: libloader @@ -1029,6 +1040,11 @@ export NOCONFIGURE=yes %else --disable-kde4 \ %endif +%if %{with system_gpgme} + --with-system-gpgmepp \ +%else + --without-system-gpgmepp \ +%endif %if %{with firebird} --enable-firebird-sdbc \ %else diff --git a/scp2-user-config-suse.diff b/scp2-user-config-suse.diff index 1d9f728..6ae0a8f 100644 --- a/scp2-user-config-suse.diff +++ b/scp2-user-config-suse.diff @@ -3,24 +3,24 @@ scp2/source/ooo/common_brand.scp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu -index 8e18ca5..7c0b95d 100644 ---- officecfg/registry/data/org/openoffice/Setup.xcu +Index: officecfg/registry/data/org/openoffice/Setup.xcu +=================================================================== +--- officecfg/registry/data/org/openoffice/Setup.xcu.orig +++ officecfg/registry/data/org/openoffice/Setup.xcu -@@ -788,7 +788,7 @@ +@@ -787,7 +787,7 @@ 10 -- Libreoffice 3=libreoffice/3,Openofice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8 -+ Libreoffice 3=libreoffice/3-suse,Openofice.org 3=ooo3,OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8 +- Libreoffice 3=libreoffice/3,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8 ++ Libreoffice 3=libreoffice/3-suse,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8 -diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp -index 7bbf873..0b235a0 100644 ---- scp2/source/ooo/common_brand.scp +Index: scp2/source/ooo/common_brand.scp +=================================================================== +--- scp2/source/ooo/common_brand.scp.orig +++ scp2/source/ooo/common_brand.scp -@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall +@@ -381,7 +381,7 @@ ProfileItem gid_Brand_Profileitem_Bootst #elif defined MACOSX Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION"; #else @@ -29,6 +29,3 @@ index 7bbf873..0b235a0 100644 #endif End --- -1.7.0.1 - From a6aed06f7e21ceea7b2190501f9fbc2ea571d936ec554dcdbc2a64004335b26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Nov 2017 13:47:32 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=541 --- libgpg-error-1.26.tar.bz2 | 3 +++ libgpg-error-1.27.tar.bz2 | 3 --- libreoffice.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 libgpg-error-1.26.tar.bz2 delete mode 100644 libgpg-error-1.27.tar.bz2 diff --git a/libgpg-error-1.26.tar.bz2 b/libgpg-error-1.26.tar.bz2 new file mode 100644 index 0000000..b80a576 --- /dev/null +++ b/libgpg-error-1.26.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69 +size 798096 diff --git a/libgpg-error-1.27.tar.bz2 b/libgpg-error-1.27.tar.bz2 deleted file mode 100644 index 19c3ccd..0000000 --- a/libgpg-error-1.27.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2 -size 813060 diff --git a/libreoffice.spec b/libreoffice.spec index 1d59424..a9fec3e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -60,7 +60,7 @@ Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonu Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 # GPGME bundle list Source1000: %{external_url}/gpgme-1.9.0.tar.bz2 -Source1001: %{external_url}/libgpg-error-1.27.tar.bz2 +Source1001: %{external_url}/libgpg-error-1.26.tar.bz2 Source1002: %{external_url}/libassuan-2.4.3.tar.bz2 # This never had an release so just bundle it as per what other distros do Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 From e1de5afa37399493760e93ad0b1a7e7be4542ee85d5815fbb533de20d44f09d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Nov 2017 13:51:49 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=542 --- gpgme-1.8.0.tar.bz2 | 3 +++ gpgme-1.9.0.tar.bz2 | 3 --- libreoffice.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 gpgme-1.8.0.tar.bz2 delete mode 100644 gpgme-1.9.0.tar.bz2 diff --git a/gpgme-1.8.0.tar.bz2 b/gpgme-1.8.0.tar.bz2 new file mode 100644 index 0000000..432def9 --- /dev/null +++ b/gpgme-1.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 +size 1298407 diff --git a/gpgme-1.9.0.tar.bz2 b/gpgme-1.9.0.tar.bz2 deleted file mode 100644 index 8fe4c80..0000000 --- a/gpgme-1.9.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb -size 1344222 diff --git a/libreoffice.spec b/libreoffice.spec index a9fec3e..4de215f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -59,7 +59,7 @@ Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 # GPGME bundle list -Source1000: %{external_url}/gpgme-1.9.0.tar.bz2 +Source1000: %{external_url}/gpgme-1.8.0.tar.bz2 Source1001: %{external_url}/libgpg-error-1.26.tar.bz2 Source1002: %{external_url}/libassuan-2.4.3.tar.bz2 # This never had an release so just bundle it as per what other distros do From 8cadcf773e38fa41c53734744f85fce9ebcabd59ea189453379cf2600c65f190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 3 Nov 2017 11:06:40 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=543 --- libreoffice.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 4de215f..a1dea6c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -132,6 +132,8 @@ BuildRequires: libfonts BuildRequires: libformula %if %{with system_gpgme} BuildRequires: libgpgmepp-devel +%else +BuildRequires: chrpath %endif BuildRequires: libjpeg-devel BuildRequires: liblayout @@ -1077,13 +1079,6 @@ make verbose=true build-nocheck # Run tests only on 64b intel as they are resource hogs %ifarch x86_64 make -unset WITH_LANG -# work around flawed accessibility check -export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" -export OOO_TEST_SOFFICE=path:%{buildroot}%{_libdir}/libreoffice/program/soffice -#timeout -k 2m 2h make smoketest.subsequentcheck -# we don't need this anymore -rm -f %{buildroot}%{_libdir}/libreoffice/program/classes/smoketest.jar %endif %install @@ -1268,6 +1263,12 @@ echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.t # Symlink libreofficekit to libdir ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so +%if !%{with system_gpgme} +chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgme.so.11 +chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgmepp.so.6 +chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libassuan.so.0 +%endif + # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose mkdir -p %{buildroot}%{python3_sitelib} From f7f24e031e821f2562bde4427279159e77737b1ffb4e210420e6b659b62cc06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 3 Nov 2017 11:08:48 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=544 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index a1dea6c..91b206c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -44,7 +44,7 @@ Name: libreoffice Version: 5.4.2.2 Release: 0 Summary: A Free Office Suite (Framework) -License: LGPL-3.0+ AND MPL-2.0+ +License: LGPL-3.0+ and MPL-2.0+ Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz From ad91272d3179e273a6c591aeb55fd879f3a25a37f7d06b6d3598ee7b509e5499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 3 Nov 2017 12:20:13 +0000 Subject: [PATCH 7/7] - Disable the verbosity of the build again, getting complaints of build log is too long... OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=545 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index f544d78..b8d97b8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 3 12:21:12 UTC 2017 - tchvatal@suse.com + +- Disable the verbosity of the build again, getting complaints of + build log is too long... + ------------------------------------------------------------------- Thu Nov 2 13:36:04 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 91b206c..d6f3cb6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1071,9 +1071,7 @@ export NOCONFIGURE=yes # no coinormp packages for coinmp # just call make here as we added the jobs in configure -# The check phase is run here too if it is split with nocheck -# install of jars get broken sometimes -make verbose=true build-nocheck +make build-nocheck %check # Run tests only on 64b intel as they are resource hogs