Accepting request 555976 from home:wolfi323:branches:Office
- Re-enable Qt4 front-end, kmymoney still needs it for its kbanking plugin - BuildIgnore libopenssl-1_0_0-devel to avoid openssl conflict on Tumbleweed OBS-URL: https://build.opensuse.org/request/show/555976 OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=4
This commit is contained in:
parent
d44ae3b5c7
commit
ae33a140b6
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 11 13:02:15 UTC 2017 - wbauer@tmo.at
|
||||
|
||||
- Re-enable Qt4 front-end, kmymoney still needs it for its kbanking
|
||||
plugin
|
||||
- BuildIgnore libopenssl-1_0_0-devel to avoid openssl conflict on
|
||||
Tumbleweed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 4 22:59:04 UTC 2017 - nico.kruber@gmail.com
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
%bcond_with qt4
|
||||
%bcond_without qt4
|
||||
|
||||
%define libversion 60
|
||||
%define devversion 4.18
|
||||
@ -34,6 +34,9 @@ BuildRequires: gtk2-devel >= 1.4
|
||||
BuildRequires: libgcrypt-devel >= 1.2.0
|
||||
BuildRequires: libopenssl-devel
|
||||
%if %{with qt4}
|
||||
%if 0%{?suse_version} >= 1500
|
||||
#!BuildIgnore: libopenssl-1_0_0-devel
|
||||
%endif
|
||||
BuildRequires: libqt4-devel
|
||||
%endif
|
||||
BuildRequires: cmake(Qt5Concurrent)
|
||||
@ -201,8 +204,10 @@ export CPP
|
||||
--disable-static \
|
||||
%if %{with qt4}
|
||||
--with-qt4-libs=%{_libdir} \
|
||||
--with-guis="fox16 qt4 qt5 gtk2" \
|
||||
%else
|
||||
--with-guis="fox16 qt5 gtk2" \
|
||||
%endif
|
||||
--with-guis="fox16 %{?with qt4:qt4} qt5 gtk2" \
|
||||
--with-plugins-cfgmgr=all \
|
||||
--with-pic
|
||||
%__make %{?smp_mflags}
|
||||
|
Loading…
Reference in New Issue
Block a user