- Don't lower minimum Qt version anymore
- Drop patches for Qt 5.9
- Drop patches for Leap 42.x
- Drop conditionals for no longer supported distribution versions

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=266
This commit is contained in:
Christophe Giboudeaux 2019-08-07 12:44:12 +00:00 committed by Git OBS Bridge
parent 1628fefc53
commit 2122cc1f4e
2 changed files with 7 additions and 13 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 19 11:42:25 UTC 2019 - Wolfgang Bauer <wbauer@tmo.at>
- Don't lower minimum Qt version anymore, it requires 5.11 now
- Drop conditionals for no longer supported openSUSE versions
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jul 14 06:41:38 UTC 2019 - lbeltrame@kde.org Sun Jul 14 06:41:38 UTC 2019 - lbeltrame@kde.org

View File

@ -76,10 +76,6 @@ BuildRequires: pkgconfig(x11)
Requires: %{name}-core = %{version} Requires: %{name}-core = %{version}
# KIO/FileDialog uses klauncher directly, but we can't add Requires, as that would introduce dep cycle # KIO/FileDialog uses klauncher directly, but we can't add Requires, as that would introduce dep cycle
Recommends: kinit Recommends: kinit
%if 0%{?suse_version} < 1330
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
BuildRequires: gcc7-c++
%endif
%if %{with lang} %if %{with lang}
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
%endif %endif
@ -91,8 +87,8 @@ file dialog also uses this to provide its network-enabled file management.
%package core %package core
Summary: Network transparent access to files and data Summary: Network transparent access to files and data
# core subpackage created with 5.9.0
Group: System/GUI/KDE Group: System/GUI/KDE
# core subpackage created with 5.9.0
Conflicts: kio <= 5.8.0 Conflicts: kio <= 5.8.0
%description core %description core
@ -131,16 +127,8 @@ Development files.
%prep %prep
%setup -q %setup -q
%autopatch -p1 %autopatch -p1
%if 0%{?suse_version} == 1500
sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt
%endif
%build %build
%if 0%{?suse_version} < 1330
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
export CC=gcc-7
export CXX=g++-7
%endif
%cmake_kf5 -d build %cmake_kf5 -d build
%make_jobs %make_jobs