rdieter pushed to kio_mtp (f22). "common subpkg, fix conflicts with kio-extras (#1208601)"

[notifications at fedoraproject.org]

>From 85df055f4f08f7b994e05e3a25fa92d7c6e1647c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 3 Apr 2015 09:03:38 -0500
Subject: common subpkg, fix conflicts with kio-extras (#1208601)


diff --git a/kio_mtp.spec b/kio_mtp.spec
index c1651f9..5fcc338 100644
--- a/kio_mtp.spec
+++ b/kio_mtp.spec
@@ -3,7 +3,7 @@
 
 Name:           kio_mtp
 Version:        0.75
-Release:        7.%{snap}git%{git_commit}%{?dist}
+Release:        8.%{snap}git%{git_commit}%{?dist}
 Summary:        An MTP KIO slave for KDE
 
 License:        GPLv2+
@@ -15,9 +15,19 @@ BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
 BuildRequires:  libmtp-devel
 
+Requires: %{name}-common >= %{version}-%{release}
+
 %description
 Provides KIO Access to MTP devices using the mtp:/// protocol.
 
+%package        common
+Summary:        Common files for %{name}
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+%description    common
+%{summary}.
+
+
 %prep
 %setup -n kio-mtp-%{version}
 
@@ -37,7 +47,7 @@ make install/fast  DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang kio_mtp --with-kde
 
 
-%files -f kio_mtp.lang
+%files
 %doc README LICENCE
 %{_kde4_libdir}/kde4/kio_mtp.so
 %{_kde4_datadir}/kde4/services/mtp.protocol
@@ -45,8 +55,13 @@ 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
 
+%files common -f kio_mtp.lang
+
 
 %changelog
+* Fri Apr 03 2015 Rex Dieter <rdieter at fedoraproject.org> 0.75-8.20141221gitc418634
+- -common subpkg, fix conflicts with kio-extras (#1208601)
+
 * Sat Jan 10 2015 Rex Dieter <rdieter at fedoraproject.org> 0.75-7.20141221gitc418634 
 - 20141221 snapshot, include translations, .spec cleanup
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kio_mtp.git/commit/?h=f22&id=85df055f4f08f7b994e05e3a25fa92d7c6e1647c