View | Details | Raw Unified | Return to bug 35515
Collapse All | Expand All

(-)a/libreoffice.spec (-6 / +7 lines)
Lines 12-18 Link Here
12
%else
12
%else
13
%def_with java
13
%def_with java
14
%def_enable kde4
14
%def_enable kde4
15
%def_disable qt5
15
%def_enable qt5
16
%endif
16
%endif
17
%def_disable mergelibs
17
%def_disable mergelibs
18
18
Lines 86-92 BuildRequires: libX11-devel libXext-devel libXinerama-devel libXrandr-devel libX Link Here
86
BuildRequires: libssl-devel
86
BuildRequires: libssl-devel
87
87
88
%if_enabled kde4
88
%if_enabled kde4
89
BuildRequires: kde4libs-devel
89
BuildRequires: kde4libs-devel kf5-kconfig-devel kf5-kcoreaddons-devel kf5-ki18n-devel kf5-kio-devel kf5-kwindowsystem-devel
90
%endif
90
%endif
91
91
92
# 4.4
92
# 4.4
Lines 110-116 BuildRequires: libxmlsec1-nss-devel libgpgme-devel Link Here
110
BuildRequires: libepubgen-devel libqxp-devel boost-locale-devel boost-filesystem-devel
110
BuildRequires: libepubgen-devel libqxp-devel boost-locale-devel boost-filesystem-devel
111
# 6.0.5
111
# 6.0.5
112
%if_enabled qt5
112
%if_enabled qt5
113
BuildRequires: qt5-base-devel
113
BuildRequires: qt5-base-devel qt5-x11extras-devel
114
%endif
114
%endif
115
115
116
# 6.1.0
116
# 6.1.0
Lines 366-375 export CXXFLAGS="$CFLAGS" Link Here
366
	--enable-release-build \
366
	--enable-release-build \
367
	--with-help \
367
	--with-help \
368
  \
368
  \
369
	%{subst_enable kde4} \
370
	%{subst_enable qt5} \
371
	--enable-gtk \
372
	--enable-gtk3 \
369
	--enable-gtk3 \
370
	--enable-gtk3-kde5 \
371
	--disable-qt5 \
372
	--disable-kde4 \
373
	--disable-kde5 \
373
	--disable-gstreamer-0-10 \
374
	--disable-gstreamer-0-10 \
374
  \
375
  \
375
  	--enable-avahi \
376
  	--enable-avahi \

Return to bug 35515