dvratil pushed to kf5-kpeople (f21). "Merge branch 'master' into f21"

[notifications at fedoraproject.org]

From f4fd609ddc0397e13997cfa33774bb967aa38e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Mon, 11 May 2015 14:55:33 +0200
Subject: Remove upstreamed patch for avoiding catalog conflicts with
 libkpeople


diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index 16f9d6e..89fb686 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -17,9 +17,6 @@ URL:            https://projects.kde.org/projects/frameworks/kpeople
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
-# use non-conflicting libkpeople5 translation catalog
-Patch1: kpeople-catalog.patch
-
 ## Once ktp-kf5 stack is ready, can consider Obsoletes
 #Obsoletes: libkpeople < 1.0
 
@@ -54,15 +51,6 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{framework}-%{version}
 
-%patch1 -p1 -b .catalog
-
-for po in po/*/libkpeople.po ; do
-pushd $(dirname $po)
-mv libkpeople.po libkpeople5.po
-popd
-done
-
-
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
diff --git a/kpeople-catalog.patch b/kpeople-catalog.patch
deleted file mode 100644
index 80180ca..0000000
--- a/kpeople-catalog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kpeople-5.8.0/CMakeLists.txt.catalog kpeople-5.8.0/CMakeLists.txt
---- kpeople-5.8.0/CMakeLists.txt.catalog	2015-03-13 03:07:30.000000000 -0500
-+++ kpeople-5.8.0/CMakeLists.txt	2015-04-07 16:42:40.806906451 -0500
-@@ -30,7 +30,7 @@ include(KDEInstallDirs)
- include(KDEFrameworkCompilerSettings)
- include(KDECMakeSettings)
- 
--add_definitions(-DTRANSLATION_DOMAIN=\"libkpeople\")
-+add_definitions(-DTRANSLATION_DOMAIN=\"libkpeople5\")
- 
- set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5People")
- 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kf5-kpeople.git/commit/?h=f21&id=3b4e39b2aeef595a3ea3325910fbcfbf1f3864c1