rdieter pushed to kio_mtp (f21). "use non-conflicting kio_mtp4 catalog instead"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 11:17:07 UTC 2015
>From e1876cb4a70b24f7b2037546172daa80e9262f9d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 7 Apr 2015 06:16:16 -0500
Subject: use non-conflicting kio_mtp4 catalog instead
diff --git a/kio-mtp-catalog.patch b/kio-mtp-catalog.patch
new file mode 100644
index 0000000..3ff92b4
--- /dev/null
+++ b/kio-mtp-catalog.patch
@@ -0,0 +1,12 @@
+diff -up kio-mtp-0.75/kio_mtp.cpp.catalog kio-mtp-0.75/kio_mtp.cpp
+--- kio-mtp-0.75/kio_mtp.cpp.catalog 2015-01-10 14:04:05.000000000 -0600
++++ kio-mtp-0.75/kio_mtp.cpp 2015-04-07 06:08:03.596846729 -0500
+@@ -42,7 +42,7 @@
+ extern "C"
+ int KDE_EXPORT kdemain ( int argc, char **argv )
+ {
+- KComponentData instance ( "kio_mtp" );
++ KComponentData instance ( "kio_mtp", "kio_mtp4" );
+
+ KGlobal::locale();
+
diff --git a/kio_mtp.spec b/kio_mtp.spec
index 52ab754..6375fc2 100644
--- a/kio_mtp.spec
+++ b/kio_mtp.spec
@@ -1,13 +1,9 @@
%define git_commit c418634
%define snap 20141221
-%if 0%{?fedora} > 21
-%global plasma5 1
-%endif
-
Name: kio_mtp
Version: 0.75
-Release: 9.%{snap}git%{git_commit}%{?dist}
+Release: 10.%{snap}git%{git_commit}%{?dist}
Summary: An MTP KIO slave for KDE
License: GPLv2+
@@ -15,33 +11,31 @@ URL: https://projects.kde.org/projects/playground/base/kio-mtp
# use releaseme
Source0: kio-mtp-%{version}-%{snap}.tar.xz
+## upstreamable patches
+# use kio-mtp4 locale catalog so as to not conflict with kio-mtp from kio-extras-5+
+Patch1: kio-mtp-catalog.patch
+
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: libmtp-devel
-%if 0%{?plasma5}
-Requires: kio-extras-mtp-common
-%else
-Requires: %{name}-common >= %{version}-%{release}
-%endif
+# short-lived subpkg
+Obsoletes: kio_mtp-common < 0.75-10
%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}
-%if 0%{?plasma5}
-rm -fv po/*/kio_mtp.po
-%endif
+%patch1 -p1 -b .catalog
+
+for po in po/*/*.po ; do
+pushd $(dirname $po)
+mv kio_mtp.po kio_mtp4.po
+popd
+done
%build
@@ -56,12 +50,10 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%if ! 0%{?plasma5}
-%find_lang kio_mtp
-%endif
+%find_lang kio_mtp4
-%files
+%files -f kio_mtp4.lang
%doc README LICENCE
%{_kde4_libdir}/kde4/kio_mtp.so
%{_kde4_datadir}/kde4/services/mtp.protocol
@@ -69,12 +61,11 @@ 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
+* Tue Apr 07 2015 Rex Dieter <rdieter at fedoraproject.org> 0.75-10.20141221gitc418634
+- use non-conflicting kio_mtp4 catalog instead
+
* Fri Apr 03 2015 Rex Dieter <rdieter at fedoraproject.org> 0.75-9.20141221gitc418634
- omit -common, Requires: kio-extras-mtp-common (f22+, plasma5)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kio_mtp.git/commit/?h=f21&id=e1876cb4a70b24f7b2037546172daa80e9262f9d
More information about the scm-commits
mailing list