diff --git a/libreoffice.changes b/libreoffice.changes index 5614d05..b9e6cfd 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Feb 21 09:49:35 UTC 2016 - tchvatal@suse.com + +- Try to enable libreofficekit integration by mimicking what RH does + bnc#965296 + +------------------------------------------------------------------- +Tue Feb 9 09:19:59 UTC 2016 - tchvatal@suse.com + +- Provide/obsolete the gtk3 subpackage in gnome to allow nice migration +- %dir the appdata folder to build on leap and older + ------------------------------------------------------------------- Sat Feb 6 12:54:39 UTC 2016 - tchvatal@suse.com @@ -12,6 +24,7 @@ Sat Feb 6 12:45:55 UTC 2016 - tchvatal@suse.com Fri Jan 29 13:00:44 UTC 2016 - tchvatal@suse.com - Version update to 5.1.0.3: + * Fixes bnc#967015 CVE-2016-0795 bnc#967014 CVE-2016-0794 * Various small fixes on road to final tag * Update internal tarballs for sle11 build diff --git a/libreoffice.spec b/libreoffice.spec index b111fef..a671cdc 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -30,7 +30,7 @@ %bcond_without oldmake %endif # Applications datastore -%if 0%{?suse_version} > 1315 +%if 0%{?suse_version} > 1310 %bcond_without appdatastore %else %bcond_with appdatastore @@ -330,6 +330,7 @@ BuildRequires: doxygen >= 1.8.4 BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk3-devel BuildRequires: libgltf-devel +BuildRequires: pkgconfig(gobject-introspection-1.0) %else BuildRequires: gcc48-c++ BuildRequires: gstreamer010-plugins-base-devel @@ -628,6 +629,9 @@ Summary: GNOME Extensions for LibreOffice License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} +# Merged back to gnome, was split on 5.0 series only +Provides: %{name}-gtk3 = %{version} +Obsoletes: %{name}-gtk3 < %{version} %description gnome This package contains some GNOME extensions for LibreOffice. @@ -763,6 +767,26 @@ This package provides extensions for LibreOffice Writer: - MediaWiki Publisher +%package -n libreofficekit +Summary: A library providing access to LibreOffice functionality +License: MPL-2.0 +Group: Productivity/Office/Suite +Requires: %{name} = %{version} + +%description -n libreofficekit +LibreOfficeKit can be used to access LibreOffice functionality +through C/C++, without any need to use UNO. + +%package -n libreofficekit-devel +Summary: Development files for libreofficekit +License: MPL-2.0 +Group: Productivity/Office/Suite +Requires: libreofficekit = %{version} + +%description -n libreofficekit-devel +The libreofficekit-devel package contains libraries and header files for +developing applications that use libreofficekit. + # Symlink autocorr files for various conversion items %define make_autocorr_aliases(l:) \ %{?-l: \ @@ -1133,6 +1157,7 @@ export NOCONFIGURE=yes --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ --enable-gtk3 \ + --enable-introspection \ --with-doxygen \ --enable-gltf \ --enable-collada --with-system-opencollada \ @@ -1325,6 +1350,9 @@ 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 echo "%{_datadir}/appdata/${appdata}.appdata.xml" >>file-lists/${appdata}_list.txt +%if 0%{?suse_version} < 1320 + echo "%dir %{_datadir}/appdata/" >>file-lists/${appdata}_list.txt +%endif rm -rf %{buildroot}%{_datadir}/appdata/libreoffice-${appdata}.appdata.xml done %endif @@ -1377,6 +1405,11 @@ for i in file-lists/*.txt; do done rm pyfiles.txt +# Symlink libreofficekit to libdir +%if %{with newmedia} +ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so +%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} @@ -1537,6 +1570,19 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %dir %{_datadir}/icons/hicolor/512x512/apps %dir %{_datadir}/icons/hicolor/512x512/mimetypes +%if %{with newmedia} +%files -n libreofficekit +%defattr(-,root,root) +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/LOKDocView-0.1.typelib +%{_libdir}/liblibreofficekitgtk.so + +%files -n libreofficekit-devel +%defattr(-,root,root) +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/LOKDocView-0.1.gir +%endif + %files -f file-lists/base_list.txt base %defattr(-,root,root)