Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2015-04-12 00:08:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2015-04-06 00:25:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2015-04-12 00:08:51.000000000 +0200 @@ -1,0 +2,23 @@ +Wed Apr 8 13:06:41 UTC 2015 - [email protected] + +- --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 - [email protected] + +- Require flow engine too on base + +------------------------------------------------------------------- +Wed Apr 8 12:24:45 UTC 2015 - [email protected] + +- Fix build on SLE12 and 13.1 by adding conditional for appdata install + +------------------------------------------------------------------- +Wed Apr 8 12:03:19 UTC 2015 - [email protected] + +- Fixup the installed appdata.xml files: they reference a .desktop + file that are not installed by libreoffice (boo#926375). + +------------------------------------------------------------------- Old: ---- 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.lju7Qj/_old 2015-04-12 00:08:57.000000000 +0200 +++ /var/tmp/diff_new_pack.lju7Qj/_new 2015-04-12 00:08:57.000000000 +0200 @@ -60,8 +60,6 @@ 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-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: 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: 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: mythes-devel BuildRequires: neon-devel >= 0.26.0 BuildRequires: npapi-sdk -BuildRequires: openCOLLADA-devel BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: patch @@ -364,6 +361,7 @@ License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} +Requires: pentaho-reporting-flow-engine Supplements: %{name} %description base @@ -963,7 +961,7 @@ --disable-ccache \ --enable-gltf --with-system-libgltf \ --disable-coinmp \ - --enable-collada --with-system-opencollada \ + --disable-collada \ --enable-symbols # no coinormp packages for coinmp @@ -1108,8 +1106,15 @@ 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 +%if 0%{?suse_version} > 1315 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 +%endif # Remove translations source as we need more space rm -rf translations/source/ @@ -1220,26 +1225,36 @@ %files -f file-lists/base_list.txt base %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-base.appdata.xml +%if 0%{?suse_version} > 1315 +%{_datadir}/appdata/base.appdata.xml +%endif %files -f file-lists/calc_list.txt calc %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-calc.appdata.xml +%if 0%{?suse_version} > 1315 +%{_datadir}/appdata/calc.appdata.xml +%endif %files -f file-lists/draw_list.txt draw %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-draw.appdata.xml +%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) -%{_datadir}/appdata/libreoffice-impress.appdata.xml +%if 0%{?suse_version} > 1315 +%{_datadir}/appdata/impress.appdata.xml +%endif %files -f file-lists/writer_list.txt writer %defattr(-,root,root) -%{_datadir}/appdata/libreoffice-writer.appdata.xml +%if 0%{?suse_version} > 1315 +%{_datadir}/appdata/writer.appdata.xml +%endif %files -f file-lists/postgresql_list.txt base-drivers-postgresql %defattr(-,root,root)
