rdieter pushed to libkpeople (f20). "Revert "0.3.0-3" (..more)"

[notifications at fedoraproject.org]

>From ac30c15b2d2380311c3ac1478269c9bb404003b4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 10 Apr 2015 14:13:27 -0500
Subject: Revert "0.3.0-3"

This reverts commit 317e142308c1500d8aac36db7aba6e0d717e5999.

diff --git a/libkpeople-catalog.patch b/libkpeople-catalog.patch
deleted file mode 100644
index 0296e0f..0000000
--- a/libkpeople-catalog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libkpeople-0.3.0/src/global.cpp.catalog libkpeople-0.3.0/src/global.cpp
---- libkpeople-0.3.0/src/global.cpp.catalog	2014-09-16 03:06:22.000000000 -0500
-+++ libkpeople-0.3.0/src/global.cpp	2015-04-07 16:37:34.047905520 -0500
-@@ -25,7 +25,7 @@
- #include <KIconLoader>
- #include <QIcon>
- 
--static const KCatalogLoader i18nLoader("libkpeople");
-+static const KCatalogLoader i18nLoader("libkpeople4");
- 
- //these namespace members expose the useful bits of PersonManager
- //global.h should be included from every exported header file so namespace members are always visible
diff --git a/libkpeople.spec b/libkpeople.spec
index 44b5eba..c809249 100644
--- a/libkpeople.spec
+++ b/libkpeople.spec
@@ -1,15 +1,12 @@
 Name:    libkpeople
 Summary: Meta-contact aggregation library
 Version: 0.3.0
-Release: 3%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 URL:     https://projects.kde.org/projects/playground/network/libkpeople
 Source0: http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
 
-# use non-conflicting libkpeople4 translation catalog
-Patch1: libkpeople-catalog.patch
-
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel > 4.10.1
 BuildRequires: kdepimlibs-devel
@@ -27,17 +24,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %prep
 %setup -q
 
-%patch1 -p1 -b .catalog
-
-for po in po/*/libkpeople.po ; do
-pushd $(dirname $po)
-mv libkpeople.po libkpeople4.po
-popd
-done
-
 
 %build
-mkdir %{_target_platform}
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -48,17 +37,19 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang libkpeople4
+%find_lang libkpeople
 
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f libkpeople4.lang
+%files -f libkpeople.lang
 %doc COPYING
 %{_kde4_appsdir}/kpeople/
-%{_kde4_libdir}/libkpeople.so.4*
-%{_kde4_libdir}/libkpeoplewidgets.so.4*
+%{_kde4_libdir}/libkpeople.so.4.3.0
+%{_kde4_libdir}/libkpeople.so.4
+%{_kde4_libdir}/libkpeoplewidgets.so.4.3.0
+%{_kde4_libdir}/libkpeoplewidgets.so.4
 %{_kde4_libdir}/kde4/*plugin.so
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
@@ -68,14 +59,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kde4_includedir}/KPeople/
 %{_kde4_libdir}/libkpeople.so
 %{_kde4_libdir}/libkpeoplewidgets.so
-%{_kde4_libdir}/cmake/KPeople/
-
+%dir %{_kde4_libdir}/cmake/KPeople/
+%{_kde4_libdir}/cmake/KPeople/KPeopleConfig.cmake
+%{_kde4_libdir}/cmake/KPeople/KPeopleConfigVersion.cmake
 
 %changelog
-* Tue Apr 07 2015 Rex Dieter <rdieter at fedoraproject.org> - 0.3.0-3
-- use non-conflicting libkpeople4 translation catalog (#1208946)
-- minor .spec cleanup
-
 * Fri Nov 14 2014 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-2
 - -devel: own %%{_kde4_libdir}/cmake/KPeople/
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libkpeople.git/commit/?h=f20&id=ac30c15b2d2380311c3ac1478269c9bb404003b4