rdieter pushed to smokekde (f22). "disable kate(4) support for f22+ (where kf5-kate and plasma5 is used)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Mar 30 12:58:45 UTC 2015


>From 63fba037b9562cd43027d85e2906bff13f922ab0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 19 Feb 2015 08:41:58 -0600
Subject: disable kate(4) support for f22+ (where kf5-kate and plasma5 is used)


diff --git a/smokekde.spec b/smokekde.spec
index 2173774..432406f 100644
--- a/smokekde.spec
+++ b/smokekde.spec
@@ -1,6 +1,11 @@
+
+%if 0%{?fedora} < 22
+%define kate 1
+%endif
+
 Name: smokekde
 Version: 4.14.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Bindings for KDE libraries
 
 License: LGPLv2+
@@ -13,7 +18,6 @@ URL:     https://projects.kde.org/projects/kde/kdebindings/smoke
 %endif
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
-BuildRequires: kate-devel >= 4.14
 BuildRequires: kdepimlibs-devel >= 4.14
 BuildRequires: okular-devel >= 4.14
 BuildRequires: pkgconfig(akonadi)
@@ -22,11 +26,17 @@ BuildRequires: smokeqt-devel >= %{version}
 
 Obsoletes: kdebindings < 4.7.0 
 
-# core/runtime deps
-Requires: kate4-part
+# versioned core/runtime deps
 Requires: smokegen%{?_isa} >= %{version}
 Requires: smokeqt%{?_isa} >= %{version}
 
+%if 0%{?kate}
+BuildRequires: kate-devel >= 4.14
+Requires: kate4-part%{?_isa}
+%else
+BuildConflicts: kate-devel
+%endif
+
 %description
 This package includes bindings for KDE libraries.
 
@@ -71,7 +81,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %files
 %doc AUTHORS COPYING.LIB
 %{_kde4_libdir}/libsmokeattica.so.3*
+%if 0%{?kate}
 %{_kde4_libdir}/libsmokekate.so.3*
+%endif
 %{_kde4_libdir}/libsmokekdecore.so.3*
 %{_kde4_libdir}/libsmokekdeui.so.3*
 %{_kde4_libdir}/libsmokekfile.so.3*
@@ -101,6 +113,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-5
+- disable kate(4) support for f22+ (where kf5-kate and plasma5 is used)
+
 * Sun Feb 01 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-4
 - rebuild (okular)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/smokekde.git/commit/?h=f22&id=63fba037b9562cd43027d85e2906bff13f922ab0


More information about the scm-commits mailing list