From 6e300ece2bb99e6dd188d4f1d89138832206f8b3b8a648ab7a8b15181da8fa4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 8 Apr 2015 12:18:54 +0000 Subject: [PATCH 1/5] Accepting request 294948 from home:dimstar:Factory Fix the installed appdata.xml files OBS-URL: https://build.opensuse.org/request/show/294948 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=237 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index c652c27..d586b67 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 8 12:03:19 UTC 2015 - dimstar@opensuse.org + +- Fixup the installed appdata.xml files: they reference a .desktop + file that are not installed by libreoffice (boo#926375). + ------------------------------------------------------------------- Thu Apr 2 17:11:50 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index a72fa41..4ef92e1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1108,8 +1108,13 @@ ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.p ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py # Install appdata files, so we're shown in gnome-software (and other, future app stores) +# upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...] +# fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name install -m 0755 -d %{buildroot}%{_datadir}/appdata -install -m 0644 -p sysui/desktop/appstream-appdata/*.appdata.xml %{buildroot}%{_datadir}/appdata +for appdata in base calc draw impress writer; do + sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop}/" \ + sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/%{appdata}.appdata.xml +done; # Remove translations source as we need more space rm -rf translations/source/ @@ -1220,26 +1225,26 @@ fi %files -f file-lists/base_list.txt base %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-base.appdata.xml +%{_datadir}/appdata/base.appdata.xml %files -f file-lists/calc_list.txt calc %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-calc.appdata.xml +%{_datadir}/appdata/calc.appdata.xml %files -f file-lists/draw_list.txt draw %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-draw.appdata.xml +%{_datadir}/appdata/draw.appdata.xml %files -f file-lists/math_list.txt math %defattr(-,root,root) %files -f file-lists/impress_list.txt impress %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-impress.appdata.xml +%{_datadir}/appdata/impress.appdata.xml %files -f file-lists/writer_list.txt writer %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-writer.appdata.xml +%{_datadir}/appdata/writer.appdata.xml %files -f file-lists/postgresql_list.txt base-drivers-postgresql %defattr(-,root,root) From 5520157b755af0ad539efeb2cf38af665032c52c3ac2e7c87b9b03188775e15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 8 Apr 2015 12:25:12 +0000 Subject: [PATCH 2/5] - Fix build on SLE12 and 13.1 by adding conditional for appdata install OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=238 --- libreoffice.changes | 5 +++++ libreoffice.spec | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index d586b67..b37c62d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 8 12:24:45 UTC 2015 - tchvatal@suse.com + +- Fix build on SLE12 and 13.1 by adding conditional for appdata install + ------------------------------------------------------------------- Wed Apr 8 12:03:19 UTC 2015 - dimstar@opensuse.org diff --git a/libreoffice.spec b/libreoffice.spec index 4ef92e1..aab116a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1110,11 +1110,13 @@ ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib} # Install appdata files, so we're shown in gnome-software (and other, future app stores) # upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...] # fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name +%if 0%{?suse_version} > 1315 install -m 0755 -d %{buildroot}%{_datadir}/appdata for appdata in base calc draw impress writer; do sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop}/" \ sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/%{appdata}.appdata.xml -done; +done +%endif # Remove translations source as we need more space rm -rf translations/source/ @@ -1225,26 +1227,36 @@ fi %files -f file-lists/base_list.txt base %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/base.appdata.xml +%endif %files -f file-lists/calc_list.txt calc %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/calc.appdata.xml +%endif %files -f file-lists/draw_list.txt draw %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/draw.appdata.xml +%endif %files -f file-lists/math_list.txt math %defattr(-,root,root) %files -f file-lists/impress_list.txt impress %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/impress.appdata.xml +%endif %files -f file-lists/writer_list.txt writer %defattr(-,root,root) +%if 0%{?suse_version} > 1315 %{_datadir}/appdata/writer.appdata.xml +%endif %files -f file-lists/postgresql_list.txt base-drivers-postgresql %defattr(-,root,root) From 36c52e3193bfefff6d89d535e140152e2d039327e6a08eb833b77222d8770608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 8 Apr 2015 12:27:13 +0000 Subject: [PATCH 3/5] - Require flow engine too on base OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=239 --- libreoffice.changes | 5 +++++ libreoffice.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index b37c62d..cd4a128 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 8 12:26:59 UTC 2015 - tchvatal@suse.com + +- Require flow engine too on base + ------------------------------------------------------------------- Wed Apr 8 12:24:45 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index aab116a..63013c7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -364,6 +364,7 @@ Summary: LibreOffice Base License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} +Requires: pentaho-reporting-flow-engine Supplements: %{name} %description base From 006aeebd5e5805f6ab0b39760f3a1c5d7ccac640695deb4305b93db7cf4808ba Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 8 Apr 2015 13:08:55 +0000 Subject: [PATCH 4/5] - --disable-collada * reportedly it does not work in LibreOffice 4.4 - added version numbers to some BuildRequires lines OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=240 --- ...920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 | 3 --- libreoffice.changes | 7 +++++++ libreoffice.spec | 13 +++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 diff --git a/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 b/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 deleted file mode 100644 index 59881f6..0000000 --- a/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb -size 555291 diff --git a/libreoffice.changes b/libreoffice.changes index cd4a128..2ad5d22 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 8 13:06:41 UTC 2015 - andras.timar@collabora.com + +- --disable-collada + * reportedly it does not work in LibreOffice 4.4 +- added version numbers to some BuildRequires lines + ------------------------------------------------------------------- Wed Apr 8 12:26:59 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 63013c7..1106af2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -60,8 +60,6 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -# Currently not possible to unbundle, sucks -Source2006: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # search help icons in %{_prefix}/share # FIXME: make it configurable in integrate into git Patch0: officecfg-help-in-usr-share.diff @@ -122,7 +120,7 @@ BuildRequires: krb5 BuildRequires: krb5-devel BuildRequires: libabw-devel BuildRequires: libbase -BuildRequires: libcdr-devel +BuildRequires: libcdr-devel >= 0.1 BuildRequires: libcmis-devel >= 0.5.0 BuildRequires: libcppunit-devel BuildRequires: libe-book-devel >= 0.1.1 @@ -143,7 +141,7 @@ BuildRequires: liblangtag-devel BuildRequires: liblayout BuildRequires: liblcms2-devel BuildRequires: libloader -BuildRequires: libmspub-devel +BuildRequires: libmspub-devel >= 0.1 BuildRequires: libmwaw-devel >= 0.3.4 BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel >= 1.0.6 @@ -157,8 +155,8 @@ BuildRequires: librevenge-devel >= 0.0.1 BuildRequires: librsvg-devel BuildRequires: libserializer BuildRequires: libtool -BuildRequires: libvisio-devel -BuildRequires: libwpd-devel +BuildRequires: libvisio-devel >= 0.1 +BuildRequires: libwpd-devel >= 0.10 BuildRequires: libwpg-devel BuildRequires: libwps-devel BuildRequires: libxml2-devel @@ -171,7 +169,6 @@ BuildRequires: mozilla-nss-devel >= 3.9.3 BuildRequires: mythes-devel BuildRequires: neon-devel >= 0.26.0 BuildRequires: npapi-sdk -BuildRequires: openCOLLADA-devel BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: patch @@ -964,7 +961,7 @@ export NOCONFIGURE=yes --disable-ccache \ --enable-gltf --with-system-libgltf \ --disable-coinmp \ - --enable-collada --with-system-opencollada \ + --disable-collada \ --enable-symbols # no coinormp packages for coinmp From 0c1c16f72a3d87f4c4ba6f19f2ed8e7d2ff7598cb4767508788ddbc59c22419e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 8 Apr 2015 21:22:24 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=241 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 1106af2..996c0e9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1112,7 +1112,7 @@ ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib} install -m 0755 -d %{buildroot}%{_datadir}/appdata for appdata in base calc draw impress writer; do sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop}/" \ - sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/%{appdata}.appdata.xml + sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/${appdata}.appdata.xml done %endif