From 00581a64078dd35012d16b86d4e460be15b84ada9c5f71c43cddf6b127cd29b6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 22 Sep 2020 09:02:23 +0000 Subject: [PATCH] Accepting request 834172 from home:yfjiang:branches:GNOME:Factory - Build with KDE on Tumbleweed, Leap and SLE releases greater than SLE-15-SP2 (jsc#SLE-12256). OBS-URL: https://build.opensuse.org/request/show/834172 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=150 --- libproxy.changes | 6 ++++++ libproxy.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libproxy.changes b/libproxy.changes index 3dd4700..dc389a1 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 14 02:58:52 UTC 2020 - Yifan Jiang + +- Build with KDE on Tumbleweed, Leap and SLE releases greater than + SLE-15-SP2 (jsc#SLE-12256). + ------------------------------------------------------------------- Mon Apr 27 10:10:47 UTC 2020 - Dominique Leuenberger diff --git a/libproxy.spec b/libproxy.spec index 7b4ce78..aeab473 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -75,7 +75,7 @@ BuildRequires: python-devel BuildRequires: pkgconfig(gio-2.0) >= 2.26 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(javascriptcoregtk-4.0) -%if 0%{?is_opensuse} +%if 0%{?sle_version} > 150200 || 0%{?is_opensuse} BuildRequires: libKF5ConfigCore5 %endif %if %{build_mozjs} @@ -313,7 +313,7 @@ cmake \ -DWITH_PYTHON2=OFF \ -DWITH_PYTHON3=OFF \ %endif -%if %build_core_not_modules || ! 0%{?is_opensuse} +%if %build_core_not_modules || (! 0%{?is_opensuse} && 0%{?sle_version} <= 150200) -DWITH_KDE=OFF \ %endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -389,7 +389,7 @@ make test %else %if ! 0%{?windows} -%if 0%{?is_opensuse} +%if 0%{?sle_version} > 150200 || 0%{?is_opensuse} %files -n libproxy1-config-kde %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_kde.so