rdieter pushed to kio_mtp (f20). "omit -common, Requires: kio-exgtra-mtp-common (f22+, plasma5)"

[notifications at fedoraproject.org]

>From 47c2a339ee940c4475df5d519daff541b7e0f5b7 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 3 Apr 2015 09:28:35 -0500
Subject: omit -common, Requires: kio-exgtra-mtp-common (f22+, plasma5)


diff --git a/kio_mtp.spec b/kio_mtp.spec
index 5fcc338..f15f784 100644
--- a/kio_mtp.spec
+++ b/kio_mtp.spec
@@ -1,9 +1,13 @@
 %define git_commit c418634
 %define snap 20141221
 
+%if 0%{?fedora} > 21
+%global plasma5 1
+%endif
+
 Name:           kio_mtp
 Version:        0.75
-Release:        8.%{snap}git%{git_commit}%{?dist}
+Release:        9.%{snap}git%{git_commit}%{?dist}
 Summary:        An MTP KIO slave for KDE
 
 License:        GPLv2+
@@ -15,7 +19,11 @@ BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
 BuildRequires:  libmtp-devel
 
+%if 0%{?plasma5}
+Requires: kio-extras-mtp-common
+%else
 Requires: %{name}-common >= %{version}-%{release}
+%endif
 
 %description
 Provides KIO Access to MTP devices using the mtp:/// protocol.
@@ -31,6 +39,10 @@ BuildArch:      noarch
 %prep
 %setup -n kio-mtp-%{version}
 
+%if 0%{?plasma5}
+rm -fv po/*/kio_mtp.po
+%endif
+
 
 %build
 mkdir %{_target_platform}
@@ -44,7 +56,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast  DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang kio_mtp --with-kde
+%if ! 0%{?plasma5}
+%find_lang kio_mtp
+%endif
 
 
 %files
@@ -55,10 +69,15 @@ make install/fast  DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kde4_datadir}/kde4/apps/solid/actions/solid_mtp.desktop
 %{_kde4_datadir}/kde4/apps/remoteview/mtp-network.desktop
 
+%if ! 0%{?plasma5}
 %files common -f kio_mtp.lang
+%endif
 
 
 %changelog
+* Fri Apr 03 2015 Rex Dieter <rdieter at fedoraproject.org> 0.75-9.20141221gitc418634
+- omit -common, Requires: kio-exgtra-mtp-common (f22+, plasma5)
+
 * Fri Apr 03 2015 Rex Dieter <rdieter at fedoraproject.org> 0.75-8.20141221gitc418634
 - -common subpkg, fix conflicts with kio-extras (#1208601)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kio_mtp.git/commit/?h=f20&id=47c2a339ee940c4475df5d519daff541b7e0f5b7