Updated to 6.3.5

libreoffice.spec

@@ -7,6 +7,7 @@
 %bcond_with icecream
 %bcond_with ccache
 %bcond_with clang
+%bcond_with gtk3-kde5
 
 %if %{with l10n}
 %define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu
@@ -101,7 +102,8 @@ BuildRequires:	bsh
 BuildRequires:	ccache
 %endif
 %if %{with clang}
-BuildRequires:  clang lld
+BuildRequires:  clang
+BuildRequires:  clang-devel
 %endif
 BuildRequires:	desktop-file-utils
 BuildRequires:	doxygen >= 1.8.4
@@ -116,7 +118,6 @@ BuildRequires:	icecream
 BuildRequires:	icu
 BuildRequires:	imagemagick
 BuildRequires:	locales-en
-BuildRequires:	mariadb
 BuildRequires:	pkgconfig(libstaroffice-0.0)
 BuildRequires:	pkgconfig(libzmf-0.0)
 BuildRequires:	pentaho-libxml
@@ -125,7 +126,7 @@ BuildRequires:	perl-Archive-Zip
 BuildRequires:	perl-MDK-Common
 BuildRequires:	perl-HTML-Parser
 BuildRequires:	perl-XML-Twig
-BuildRequires:	python2-translate >= 1.9.0
+BuildRequires:	python2-translate
 BuildRequires:	recode
 BuildRequires:	sac
 BuildRequires:	servlet3
@@ -149,7 +150,7 @@ BuildRequires:	pam-devel
 BuildRequires:	readline-devel
 BuildRequires:  systemtap-devel
 BuildRequires:	unixODBC-devel
-BuildRequires:	vigra-devel
+#BuildRequires:	vigra-devel
 BuildRequires:	gpgmepp-devel
 BuildRequires:	pkgconfig(bluez)
 BuildRequires:	pkgconfig(cppunit) >= 1.14.0
@@ -168,7 +169,6 @@ BuildRequires:	pkgconfig(gdk-pixbuf-xlib-2.0)
 BuildRequires:	pkgconfig(graphite2)
 BuildRequires:	pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:	pkgconfig(egl)
-BuildRequires:	pkgconfig(gtk+-2.0)
 BuildRequires:	pkgconfig(gtk+-3.0)
 BuildRequires:	pkgconfig(hunspell)
 BuildRequires:	pkgconfig(icu-le)
@@ -325,6 +325,7 @@ packages:
 %files base -f file-lists/base_list.txt
 %{_mandir}/man1/lobase*
 %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-base_72.svg
+%dir %{ooodir}/share/xdg
 %{ooodir}/share/xdg/base.desktop
 %{_datadir}/appdata/libreoffice-base.appdata.xml
 
@@ -341,6 +342,7 @@ This package contains the spreadsheet component for LibreOffice.
 %files calc -f file-lists/calc_list.txt
 %{_mandir}/man1/localc*
 %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg
+%dir %{ooodir}/share/xdg
 %{ooodir}/share/xdg/calc.desktop
 %{_datadir}/appdata/libreoffice-calc.appdata.xml
 
@@ -438,8 +440,6 @@ This package contains the application-independent files of LibreOffice.
 %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb
 %{ooodir}/share/gallery/sg24.*
 %{ooodir}/share/libreofficekit
-%dir %{ooodir}/share/xdg
-%exclude %{ooodir}/share/xdg/*.desktop
 %{_datadir}/appdata/org.libreoffice.kde.metainfo.xml
 
 #----------------------------------------------------------------------------
@@ -514,6 +514,7 @@ This package contains the drawing component for LibreOffice.
 %files draw -f file-lists/draw_list.txt
 %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-draw_72.svg
 %{_mandir}/man1/lodraw*
+%dir %{ooodir}/share/xdg
 %{ooodir}/share/xdg/draw.desktop
 %{_datadir}/appdata/libreoffice-draw.appdata.xml
 
@@ -531,6 +532,8 @@ This package contains the GNOME VFS support and a GConf backend.
 
 #----------------------------------------------------------------------------
 
+%if %{with gtk3-kde5}
+
 %package gtk3-kde5
 Summary:	GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook)
 Group:		Office
@@ -538,13 +541,15 @@ Requires:	%{name}-common = %{EVRD}
 Recommends:	%{name}-style-breeze = %{EVRD}
 
 %description gtk3-kde5
-This package contains the VCL plugin to draw interface with GTK+3
+This package contains the KDE5 plugin for drawing LibreOffice widgets with
-but use KDE5 file picker.
+KDE5/Qt5.x and a KDEish File Picker when running under KDE5.
 
 %files gtk3-kde5
 %{ooodir}/program/libvclplug_gtk3_kde5lo.so
 %{ooodir}/program/lo_kde5filepicker
 
+%endif
+
 #----------------------------------------------------------------------------
 
 %package kde5
@@ -564,27 +569,6 @@ KDE5/Qt5.x and a KDEish File Picker when running under KDE5.
 
 #----------------------------------------------------------------------------
 
-%package kde4
-Summary:	Transitional package to migrate from libreoffice-kde4
-Group:		Office
-# GTK3-KDE5 VCL is much more mature than QT5-KDE5
-# because of maturity of GTK3 VCL,
-# so let's migrate users of libreoffice-kde4 to libreoffice-gtk3-kde5
-Requires:	%{name}-gtk3-kde5 = %{EVRD}
-%rename %{name}-kde4
-
-%description kde4
-Transitional package to migrate from libreoffice-kde4 to libreoffice-gtk3-kde5.
-KDE4 VCL was very buggy, we disabled it in ROSA and are migrating users to
-libreoffice-gtk3-kde5 (not libreoffice-kde5 because GTK3 VCL is
-much more mature that Qt5/KDE5 VCL).
-You may delete this package and choose any VCL you want.
-
-%files kde4
-# empty transitional package
-
-#----------------------------------------------------------------------------
-
 %package impress
 Summary:	LibreOffice office suite - presentation
 Group:		Office
@@ -598,6 +582,7 @@ This package contains the presentation component for LibreOffice.
 %files impress -f file-lists/impress_list.txt
 %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg
 %{_mandir}/man1/loimpress*
+%dir %{ooodir}/share/xdg
 %{ooodir}/share/xdg/impress.desktop
 %{_datadir}/appdata/libreoffice-impress.appdata.xml
 
@@ -614,6 +599,7 @@ This package contains the equation editor component for LibreOffice.
 %files math -f file-lists/math_list.txt
 %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-math_72.svg
 %{_mandir}/man1/lomath*
+%dir %{ooodir}/share/xdg
 %{ooodir}/share/xdg/math.desktop
 
 #----------------------------------------------------------------------------
@@ -727,6 +713,7 @@ This package contains the word processor component for LibreOffice.
 %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-writer_72.svg
 %{_mandir}/man1/loweb*
 %{_mandir}/man1/lowriter*
+%dir %{ooodir}/share/xdg
 %{ooodir}/share/xdg/writer.desktop
 %{_datadir}/appdata/libreoffice-writer.appdata.xml
 
@@ -785,19 +772,6 @@ A LibreOffice extension for style and grammar proofreading.
 
 #----------------------------------------------------------------------------
 
-%package extension-mysql
-Summary:	MySQL/MariaDB connector for LibreOffice
-Group:		Office
-Requires:	%{name}-common = %{EVRD}
-
-%description extension-mysql
-MySQL/MariaDB connector for LibreOffice.
-
-%files extension-mysql
-%{ooodir}/share/extensions/mysql-connector-ooo
-
-#----------------------------------------------------------------------------
-
 %package extension-nlpsolver
 Summary:	Solver extension for LibreOffice Calc
 Group:		Office
@@ -3015,9 +2989,11 @@ sed -i \
 	--enable-gstreamer-1.0 \
 	--disable-gstreamer-0.10 \
 	--enable-release-build \
-	--enable-gtk \
+	--disable-gtk \
 	--enable-gtk3 \
+%if %{with gtk3-kde5}
 	--enable-gtk3-kde5 \
+%endif
 	--enable-kde5 \
 	--enable-qt5 \
 	--disable-firebird-sdbc \
@@ -3208,8 +3184,6 @@ cd ..
 # Split gallery
 grep /share/gallery/ file-lists/common_list.txt >file-lists/gallery_list.txt
 sed -i -e '/\/share\/gallery\//d' file-lists/common_list.txt
-# calc.desktop, writer.desktop etc. go into libreoffice-calc, libreoffice-writer etc. subpackages
-sed -i -e '/\/share\/xdg\/.*.desktop/d' file-lists/common_list.txt
 # We catch those in a regex to catch Sun Template extras
 sed -i -e '/gallery\/sg[0-9]*\..*/d' file-lists/gallery_list.txt
 
@@ -3224,6 +3198,9 @@ cat file-lists/common_list.uniq.sorted.txt >>file-lists/core_list.txt
 sort -u file-lists/core_list.txt > file-lists/core_list.uniq.sorted.txt
 cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt
 
+egrep -v "libreoffice/share/xdg/(base|calc|draw|impress|math|writer)" file-lists/core_list.txt > file-lists/core_list.uniq.sorted.txt
+cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt
+
 # files for help-* and l10n-* packages
 %if %{with l10n}
 %{expand:%(for i in %{langs}; do