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

[notifications at fedoraproject.org]

>From 7e6b9fcbae94fae96cba5bfcfe7124501c72fc7a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 7 Apr 2015 16:45:28 -0500
Subject: 5.8.0-3

- use non-conflicting libkpeople5 translation catalog (#1208946)
- minor .spec cosmetics

diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index 128c51b..9c8caec 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -17,9 +17,10 @@ URL:            https://projects.kde.org/projects/frameworks/kpeople
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
-## Temporary, see http://bugzilla.redhat.com/1208946
-Conflicts:  libkpeople < 1.0
-## Once ktp-kf5 stack is ready, switch Conflicts to Obsoletes
+# use non-conflicting libkpeople5 translation catalog
+Patch1: kpeople-catalog.patch
+
+## Once ktp-kf5 stack is ready, can consider Obsoletes
 #Obsoletes: libkpeople < 1.0
 
 BuildRequires:  kf5-rpm-macros
@@ -53,8 +54,17 @@ 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 -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} .. \
     -DENABLE_EXAMPLES:BOOL=OFF
@@ -62,6 +72,7 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang kpeople5_qt --with-qt --all-name
@@ -88,7 +99,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kf5_archdatadir}/mkspecs/modules/qt_KPeople.pri
 %{_kf5_archdatadir}/mkspecs/modules/qt_KPeopleWidgets.pri
 
+
 %changelog
+* Tue Apr 07 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.8.0-3
+- use non-conflicting libkpeople5 translation catalog (#1208946)
+- minor .spec cosmetics
+
 * Sat Apr 04 2015 Rex Dieter <rdieter at fedoraproject.org> 5.8.0-2
 - Conflicts: libkpeople (#1208946)
 
diff --git a/kpeople-catalog.patch b/kpeople-catalog.patch
new file mode 100644
index 0000000..80180ca
--- /dev/null
+++ b/kpeople-catalog.patch
@@ -0,0 +1,12 @@
+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


>From a8638f23b30390288c25bdc75516a34a01aeaa2c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 7 Apr 2015 16:45:46 -0500
Subject: Release++


diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index 9c8caec..b90fbfd 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -2,7 +2,7 @@
 
 Name:           kf5-%{framework}
 Version:        5.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 library for contact and people aggregation
 
 License:        LGPLv2+
-- 
cgit v0.10.2


>From 41929373972ab0b425a125ce4c5ff9ce74e545f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Tue, 7 Apr 2015 13:54:41 +0200
Subject: KDE Frameworks 5.9.0


diff --git a/.gitignore b/.gitignore
index c1fa675..2f2a512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kpeople-5.8.0.tar.xz
+/kpeople-5.9.0.tar.xz
diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index b90fbfd..59e3f10 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -1,8 +1,8 @@
 %global framework kpeople
 
 Name:           kf5-%{framework}
-Version:        5.8.0
-Release:        3%{?dist}
+Version:        5.9.0
+Release:        1%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 library for contact and people aggregation
 
 License:        LGPLv2+
@@ -101,6 +101,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Tue Apr 07 2015 Daniel Vrátil <dvratil at redhat.com> - 5.9.0-1
+- KDE Frameworks 5.9.0
+
 * Tue Apr 07 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.8.0-3
 - use non-conflicting libkpeople5 translation catalog (#1208946)
 - minor .spec cosmetics
diff --git a/sources b/sources
index baffa7e..d68773c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5effd861add4d39d0bd3756b17fa814c  kpeople-5.8.0.tar.xz
+83fa36023102fe1e914509ec4a3f5fe4  kpeople-5.9.0.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kf5-kpeople.git/commit/?h=f20&id=f134c451b0c59112e84269df4e7a8aff596ee3e2