[kf5-krunner/f20] Clean up spec file, autodetect stable/unstable download folder

Daniel Vrátil dvratil at fedoraproject.org
Tue Nov 4 12:42:46 UTC 2014


commit 12df2fb4c44dd8a82895ae53adefe1497800f95f
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Nov 3 13:30:28 2014 +0100

    Clean up spec file, autodetect stable/unstable download folder

 kf5-krunner.spec |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/kf5-krunner.spec b/kf5-krunner.spec
index 3e9c420..25ec8d5 100644
--- a/kf5-krunner.spec
+++ b/kf5-krunner.spec
@@ -1,4 +1,3 @@
-# %define snapshot 20140213
 %define framework krunner
 
 Name:           kf5-%{framework}
@@ -8,12 +7,14 @@ Summary:        KDE Frameworks 5 Tier 3 solution with parallelized query system
 
 License:        LGPLv2+ and BSD
 URL:            http://www.kde.org
-# git archive --format=tar --prefix=%{framework}-%{version}/ \
-#             --remote=git://anongit.kde.org/%{framework}.git master | \
-# bzip2 -c > %{name}-%{version}-%{snapshot}git.tar.bz2
-# Source0:        %{name}-%{version}-%{snapshot}git.tar.bz2
-Source0:        http://download.kde.org/stable/frameworks/%{version}/portingAids/%{framework}-%{version}.tar.xz
 
+%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/%{version}/portingAids/%{framework}-%{version}.tar.xz
 
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  extra-cmake-modules
@@ -33,7 +34,6 @@ Requires:       kf5-filesystem
 %description
 KRunner provides a parallelized query system extendable via plugins.
 
-
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -49,6 +49,7 @@ Requires:       kf5-threadweaver-devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %prep
 %setup -q -n %{framework}-%{version}
 
@@ -63,11 +64,10 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 %make_install -C %{_target_platform}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-
 %files
 %{_kf5_libdir}/libKF5Runner.so.*
 %{_kf5_qmldir}/org/kde/runnermodel
@@ -81,6 +81,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_kf5_libdir}/cmake/KF5Runner
 %{_kf5_archdatadir}/mkspecs/modules/qt_KRunner.pri
 
+
 %changelog
 * Mon Nov 03 2014 Daniel Vrátil <dvratil at redhat.com> - 5.4.0-1
 - KDE Frameworks 5.4.0


More information about the scm-commits mailing list