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

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


commit 05a9de6ef98b9be9c26c6f91a11ba1fceea56cd1
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Nov 3 12:54:11 2014 +0100

    Clean up spec file, autodetect stable/unstable download folder

 kf5-solid.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/kf5-solid.spec b/kf5-solid.spec
index 9fe115b..1ffef03 100644
--- a/kf5-solid.spec
+++ b/kf5-solid.spec
@@ -1,4 +1,3 @@
-#%define snapshot 20140205
 %define framework solid
 
 Name:           kf5-%{framework}
@@ -8,11 +7,14 @@ Summary:        KDE Frameworks 5 Tier 1 integration module that provides hardwar
 
 License:        LGPLv2+
 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}/%{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}/%{framework}-%{version}.tar.xz
 
 BuildRequires:  libupnp-devel
 BuildRequires:  systemd-devel
@@ -60,11 +62,10 @@ make %{?_smp_mflags} -C %{_target_platform}
 %make_install -C %{_target_platform}
 %find_lang solid5_qt --with-qt --all-name
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-
 %files -f solid5_qt.lang
 %doc COPYING.LIB README.md TODO
 %{_kf5_qmldir}/org/kde/solid
@@ -78,6 +79,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_kf5_libdir}/cmake/KF5Solid
 %{_kf5_archdatadir}/mkspecs/modules/qt_Solid.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