diff --git a/libreoffice.changes b/libreoffice.changes index 6c12814..8155c8a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 7 07:42:34 UTC 2019 - Tomáš Chvátal + +- As gtk2 will be removed in future releases we are disabling it + on 6.3 too to test out if we expose some regressions while we + can revert back and enable it again + ------------------------------------------------------------------- Fri Sep 27 19:53:32 UTC 2019 - Jonathan Brielmaier diff --git a/libreoffice.spec b/libreoffice.spec index 86cd5c2..99ed022 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -41,7 +41,6 @@ %endif %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %bcond_without system_gpgme -%bcond_without gtk3 %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages @@ -49,7 +48,6 @@ %global __requires_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$ %global __requires_exclude ^libgpgmepp\\.so.*$ %bcond_with system_gpgme -%bcond_with gtk3 %endif Name: libreoffice Version: 6.3.2.2 @@ -177,7 +175,6 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42 BuildRequires: pkgconfig(hunspell) @@ -269,17 +266,8 @@ BuildRequires: gcc7-c++ Requires(post): update-desktop-files Requires(postun): update-desktop-files %endif -%if %{with gtk3} BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(gtk+-3.0) >= 3.18 -%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 %endif @@ -569,23 +557,6 @@ Supplements: packageand(libreoffice:plasma5-workspace) %description gtk3 This package contains Gtk3 interface rendering option for LibreOffice. -%package gtk2 -Summary: Gtk2 interface for LibreOffice -Group: Productivity/Office/Suite -Recommends: %{name}-gnome = %{version} -Conflicts: %{name}-gnome < %{version} -# We are default if gtk3 is not present -%if !%{with gtk3} -Supplements: packageand(libreoffice:gnome-session) -# Without kde and gtk3 ntegration we provide gtk2 interface there -%if !%{with kdeintegration} -Supplements: packageand(libreoffice:plasma5-workspace) -%endif -%endif - -%description gtk2 -This package contains Gtk2 interface rendering option for LibreOffice. - %package qt5 Summary: Qt5/KDE Frameworks interface for LibreOffice Group: Productivity/Office/Suite @@ -1088,8 +1059,8 @@ export NOCONFIGURE=yes --disable-online-update \ --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ -%if %{with gtk3} --enable-gtk3 \ + --disable-gtk \ %if %{with kdeintegration} --disable-gtk3-kde5 \ --enable-kde5 \ @@ -1097,9 +1068,6 @@ export NOCONFIGURE=yes %else --disable-kde5 \ --disable-qt5 \ -%endif -%else - --disable-gtk3 \ %endif --enable-introspection \ --with-doxygen \ @@ -1172,9 +1140,6 @@ set +x # Split out gtk3 interface to -gtk3 subpackage grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist mv tmplist file-lists/gnome_list.txt -# also split out gtk2 interface to make sure we do not pull gtk2 for fun of it -grep -v "%{_libdir}/libreoffice/program/libvclplug_gtklo.so" file-lists/gnome_list.txt > tmplist -mv tmplist file-lists/gnome_list.txt # Remove firebird connector from main package filelist %if %{with firebird} @@ -1347,17 +1312,12 @@ rm pyfiles.txt cp %{SOURCE6} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.txt -%if %{with gtk3} # Symlink gtk3 libreofficekit to libdir ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so # Libreofficekit headers mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/ install -m 0644 include/LibreOfficeKit/* %{buildroot}%{_includedir}/LibreOfficeKit/ -%else -# remove files that are not supposed to be installed with disabled libreofficekit -rm -rf %{buildroot}%{_libdir}/libreoffice/share/libreofficekit/ -%endif # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose @@ -1468,7 +1428,6 @@ exit 0 %dir %{_datadir}/icons/locolor/32x32/apps %dir %{_datadir}/icons/locolor/32x32/mimetypes -%if %{with gtk3} %files -n libreofficekit %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/LOKDocView-0.1.typelib @@ -1483,7 +1442,6 @@ exit 0 %{_datadir}/gir-1.0/LOKDocView-0.1.gir %dir %{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit/* -%endif %files glade %dir %{_datadir}/glade @@ -1530,13 +1488,8 @@ exit 0 %files -f file-lists/gnome_list.txt gnome -%if %{with gtk3} %files gtk3 %{_libdir}/libreoffice/program/libvclplug_gtk3lo.so -%endif - -%files gtk2 -%{_libdir}/libreoffice/program/libvclplug_gtklo.so %if %{with kdeintegration} %files -f file-lists/kde4_list.txt qt5