From 913e4e2a04d974e41b8bc3842b389a5e65119434ace14391ab2835ba18949079 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 17 Sep 2016 17:57:07 +0000 Subject: [PATCH] Use the right, existing macro OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/plasma5-workspace?expand=0&rev=7 --- plasma5-workspace.spec | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index bcf861f..e05a0ce 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -65,14 +65,14 @@ BuildRequires: cmake(KF5Runner) >= %{kf5_version} BuildRequires: cmake(KF5Screen) >= 5.0.93 BuildRequires: cmake(KF5Solid) >= %{kf5_version} BuildRequires: cmake(KF5Su) >= %{kf5_version} -BuildRequires: cmake(KF5SysGuard) >= %{_plasma5_version} +BuildRequires: cmake(KF5SysGuard) >= %{version} BuildRequires: cmake(KF5TextEditor) BuildRequires: cmake(KF5TextWidgets) >= %{kf5_version} BuildRequires: cmake(KF5Wallet) >= %{kf5_version} -BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version} +BuildRequires: cmake(KF5Wayland) >= %{version} BuildRequires: cmake(KF5XmlRpcClient) -BuildRequires: cmake(KScreenLocker) >= %{_plasma5_version} -BuildRequires: cmake(KWinDBusInterface) >= %{_plasma5_version} +BuildRequires: cmake(KScreenLocker) >= %{version} +BuildRequires: cmake(KWinDBusInterface) >= %{version} BuildRequires: cmake(Qt5Concurrent) >= 5.4.0 BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Network) >= 5.4.0 @@ -84,7 +84,7 @@ BuildRequires: cmake(Qt5Sql) >= 5.4.0 BuildRequires: cmake(Qt5Test) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 -BuildRequires: cmake(ScreenSaverDBusInterface) >= %{_plasma5_version} +BuildRequires: cmake(ScreenSaverDBusInterface) >= %{version} BuildRequires: cmake(dbusmenu-qt5) BuildRequires: pkgconfig(libgps) BuildRequires: pkgconfig(libqalculate) @@ -104,31 +104,31 @@ Conflicts: kdebase4-workspace < 5.3.0 Conflicts: kio-extras5 < 15.08.0 Requires: %{name}-libs = %{version}-%{release} # used within startup -Requires: kde-cli-tools5 >= %{_plasma5_version} +Requires: kde-cli-tools5 >= %{version} Requires: kded Requires: kdelibs4support Requires: kinit -Requires: kscreenlocker >= %{_plasma5_version} -Requires: kwin5 >= %{_plasma5_version} +Requires: kscreenlocker >= %{version} +Requires: kwin5 >= %{version} Requires: libqt5-qttools >= 5.4.0 # /usr/bin/startkde calls xprop Requires: xprop # contains default style, cursors, etc -Requires: breeze >= %{_plasma5_version} +Requires: breeze >= %{version} # needed by krunner -Requires: milou5 >= %{_plasma5_version} +Requires: milou5 >= %{version} # heavily used by plasma Requires: libqt5-qtquickcontrols # battery applet -Requires: drkonqi5 >= %{_plasma5_version} -Requires: kglobalaccel5 >= %{_plasma5_version} +Requires: drkonqi5 >= %{version} +Requires: kglobalaccel5 >= %{version} Requires: solid-imports # dialog/platformtheme/etc Requires: frameworkintegration-plugin -Requires: kscreen5 >= %{_plasma5_version} -Requires: libkscreen2-plugin >= %{_plasma5_version} +Requires: kscreen5 >= %{version} +Requires: libkscreen2-plugin >= %{version} # boo#912317 -Requires: oxygen5-sounds >= %{_plasma5_version} +Requires: oxygen5-sounds >= %{version} # hardcode versions of plasma-framework-componets and plasma-framework-private packages, as upstream doesn't keep backwards compability there %requires_ge plasma-framework-components %requires_ge plasma-framework-private @@ -183,7 +183,7 @@ workspace. Summary: The KDE Plasma Workspace Components Group: Development/Libraries/KDE Requires: %{name}-libs = %{version}-%{release} -Requires: cmake(KF5SysGuard) >= %{_plasma5_version} +Requires: cmake(KF5SysGuard) >= %{version} Requires: cmake(KF5Wayland) >= %{kf5_version} Requires: cmake(Qt5Core) >= 5.4.0 Requires: cmake(Qt5Gui) >= 5.4.0