rdieter pushed to kio-extras (f22). "temporarily adjust kio_mtp catalog until kde4 updates hit stable"

[notifications at fedoraproject.org]

>From 22837fbfe6921015ae034a2f94e29508e2126ee8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 7 Apr 2015 08:00:11 -0500
Subject: temporarily adjust kio_mtp catalog until kde4 updates hit stable


diff --git a/kio-extras-5.2.2-mtp_catalog.patch b/kio-extras-5.2.2-mtp_catalog.patch
new file mode 100644
index 0000000..730a0b5
--- /dev/null
+++ b/kio-extras-5.2.2-mtp_catalog.patch
@@ -0,0 +1,12 @@
+diff -up kio-extras-5.2.2/mtp/kio_mtp.cpp.catalog kio-extras-5.2.2/mtp/kio_mtp.cpp
+--- kio-extras-5.2.2/mtp/kio_mtp.cpp.catalog	2015-03-19 07:32:48.000000000 -0500
++++ kio-extras-5.2.2/mtp/kio_mtp.cpp	2015-04-07 07:12:12.867492391 -0500
+@@ -44,7 +44,7 @@ extern "C"
+ int Q_DECL_EXPORT kdemain(int argc, char **argv)
+ {
+     QCoreApplication app(argc, argv);
+-    app.setApplicationName(QLatin1String("kio_mtp"));
++    app.setApplicationName(QLatin1String("kio_mtp5"));
+ 
+     if (argc != 4) {
+         fprintf(stderr, "Usage: kio_mtp protocol domain-socket1 domain-socket2\n");
diff --git a/kio-extras.spec b/kio-extras.spec
index 3f7efd9..4e18bc7 100644
--- a/kio-extras.spec
+++ b/kio-extras.spec
@@ -1,6 +1,6 @@
 Name:           kio-extras
 Version:        5.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional components to increase the functionality of KIO Framework
 
 License:        GPLv2+
@@ -15,6 +15,10 @@ URL:            https://projects.kde.org/projects/kde/workspace/kio-extras
 %endif
 Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
 
+## downstream patches
+# temporarily adjust translation catalog until kio_mtp updates hit stable
+Patch1: kio-extras-5.2.2-mtp_catalog.patch
+
 BuildRequires:  kf5-rpm-macros
 
 BuildRequires:  qt5-qtbase-devel
@@ -73,6 +77,14 @@ BuildArch:      noarch
 %prep
 %setup -q -n %{name}-%{version}
 
+# temporary
+%patch1 -p1 -b .mtp_catalog
+for po in po/*/kio_mtp.po ; do
+pushd $(dirname $po)
+mv kio_mtp.po kio_mtp5.po
+popd
+done
+
 
 %build
 mkdir %{_target_platform}
@@ -161,6 +173,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Apr 07 2015 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-3.1
+- temporarily adjust kio_mtp catalog until kde4 updates hit stable
+
 * Tue Apr 07 2015 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-3
 - drop mtp-common subpkg
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kio-extras.git/commit/?h=f22&id=22837fbfe6921015ae034a2f94e29508e2126ee8