From 81d93ba63cc33f4eaff0ecebef32adbcd9b6fc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 3 Nov 2014 12:54:11 +0100 Subject: [PATCH] Clean up spec file, autodetect stable/unstable download folder --- kf5-kwindowsystem.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/kf5-kwindowsystem.spec b/kf5-kwindowsystem.spec index a65acc0..d521f3f 100644 --- a/kf5-kwindowsystem.spec +++ b/kf5-kwindowsystem.spec @@ -1,4 +1,3 @@ -#%define snapshot 20140207 %define framework kwindowsystem Name: kf5-%{framework} @@ -8,14 +7,14 @@ Summary: KDE Frameworks 5 Tier 1 integration module with classes for wind License: LGPLv2+ and MIT 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 -# Upstream fix for KDE#339771 -Patch10: kf5-kwindowsystem-5.3.0-kde#339771.patch +%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: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -45,8 +44,6 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} -%patch10 -p1 -b .kde339771 - %build mkdir -p %{_target_platform} pushd %{_target_platform} @@ -59,11 +56,10 @@ make %{?_smp_mflags} -C %{_target_platform} %make_install -C %{_target_platform} %find_lang kwindowsystem5_qt --with-qt --all-name -%post -p /sbin/ldconfig +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -f kwindowsystem5_qt.lang %doc COPYING.LIB README.md %{_kf5_libdir}/libKF5WindowSystem.so.* @@ -79,6 +75,7 @@ make %{?_smp_mflags} -C %{_target_platform} %changelog * Mon Nov 03 2014 Daniel Vrátil - 5.4.0-1 - KDE Frameworks 5.4.0 +- drop upstreamed patches * Mon Oct 13 2014 Daniel Vrátil - 5.3.0-2 - Add upstream patch for KDE#339771 (fixes crash in KWin on startup)