From 17268a3b5dad2dc67f74f7ae961f676dd5de35a3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 14 Sep 2017 15:10:36 -0500 Subject: [PATCH] fix build (harder), cosmetics --- kf5-krunner.spec | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/kf5-krunner.spec b/kf5-krunner.spec index 2ddc830..b3b5878 100644 --- a/kf5-krunner.spec +++ b/kf5-krunner.spec @@ -8,33 +8,33 @@ Summary: KDE Frameworks 5 Tier 3 solution with parallelized query system License: LGPLv2+ and BSD URL: https://cgit.kde.org/%{framework}.git -%global versiondir %(echo %{version} | cut -d. -f1-2) +%global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/portingAids/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/portingAids/%{framework}-%{version}.tar.xz # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kcoreaddons-devel >= %{version} -BuildRequires: kf5-ki18n-devel >= %{version} -BuildRequires: kf5-kio-devel >= %{version} -BuildRequires: kf5-kservice-devel >= %{version} -BuildRequires: kf5-plasma-devel >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} -BuildRequires: kf5-solid-devel >= %{version} -BuildRequires: kf5-threadweaver-devel >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-rpm-macros + +BuildRequires: kf5-kconfig-devel >= %{majmin} +BuildRequires: kf5-kcoreaddons-devel >= %{majmin} +BuildRequires: kf5-ki18n-devel >= %{majmin} +BuildRequires: kf5-kio-devel >= %{majmin} +BuildRequires: kf5-kservice-devel >= %{majmin} +BuildRequires: kf5-plasma-devel >= %{majmin} +BuildRequires: kf5-solid-devel >= %{majmin} +BuildRequires: kf5-threadweaver-devel >= %{majmin} + BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel -Requires: kf5-filesystem >= %{version} - %description KRunner provides a parallelized query system extendable via plugins. @@ -43,7 +43,7 @@ Summary: Development files for %{name} # krunner template moved here Conflicts: kapptemplate < 16.03.80 Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: kf5-plasma-devel >= %{version} +Requires: kf5-plasma-devel >= %{majmin} Requires: qt5-qtbase-devel %description devel The %{name}-devel package contains libraries and header files for @@ -51,7 +51,7 @@ developing applications that use %{name}. %prep -%setup -q -n %{framework}-%{version} +%autosetup -n %{framework}-%{version} -p1 %build @@ -86,7 +86,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %dir %{_kf5_datadir}/kdevappwizard/ %dir %{_kf5_datadir}/kdevappwizard/templates/ %{_kf5_datadir}/kdevappwizard/templates/runner* -%{_kf5_datadir}dbus-1/interfaces/kf5_org.kde.krunner1.xml +%{_kf5_datadir}/dbus-1/interfaces/* %changelog