From 524b08a1fb01793e25b4026c3935a5636783561439bc24b09aca93e698a4b16e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 6 Feb 2017 12:47:59 +0000 Subject: [PATCH] Accepting request 454968 from GNOME:Next try again, with less stupidity OBS-URL: https://build.opensuse.org/request/show/454968 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=133 --- libproxy-plugins.changes | 7 +++++++ libproxy-plugins.spec | 6 +++++- libproxy.changes | 7 +++++++ libproxy.spec | 6 +++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index e15af2c..5f37431 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 6 12:30:17 UTC 2017 - dimstar@opensuse.org + +- Have libproxy1-config-kde require libqt5-qtpaths instead of + libqt5-qttools on openSUSE > 13.2 / openSUSE > Leap 42.x + (boo#988808). + ------------------------------------------------------------------- Mon Jan 9 14:33:04 UTC 2017 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index a8e7654..3a7ab23 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -187,8 +187,12 @@ Group: System/Libraries Requires: libproxy1 = %{version} # We don't really need the library, but this package brings kreadconfig5 Requires: libKF5ConfigCore5 -# The kde plugin requires 'qtpaths', which is part of libqt5-qttools +# The kde plugin requires 'qtpaths', which is part of libqt5-qtpaths in TW / libqt5-qttools in older releases +%if %{?suse_version} > 1320 +Requires: libqt5-qtpaths +%else Requires: libqt5-qttools +%endif %if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} Supplements: packageand(libproxy1:libkde4) diff --git a/libproxy.changes b/libproxy.changes index e15af2c..5f37431 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 6 12:30:17 UTC 2017 - dimstar@opensuse.org + +- Have libproxy1-config-kde require libqt5-qtpaths instead of + libqt5-qttools on openSUSE > 13.2 / openSUSE > Leap 42.x + (boo#988808). + ------------------------------------------------------------------- Mon Jan 9 14:33:04 UTC 2017 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index 493e103..1310368 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -187,8 +187,12 @@ Group: System/Libraries Requires: libproxy1 = %{version} # We don't really need the library, but this package brings kreadconfig5 Requires: libKF5ConfigCore5 -# The kde plugin requires 'qtpaths', which is part of libqt5-qttools +# The kde plugin requires 'qtpaths', which is part of libqt5-qtpaths in TW / libqt5-qttools in older releases +%if %{?suse_version} > 1320 +Requires: libqt5-qtpaths +%else Requires: libqt5-qttools +%endif %if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} Supplements: packageand(libproxy1:libkde4)