From 4f8475f190fb0e0e165e7f80e3c895212d728ece Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 14 Jan 2016 11:39:21 -0600
Subject: [PATCH] cosmetics, update URL, use %license, Obsoletes: libkpeople
 (f24+)

---
 .gitignore       | 10 ----------
 kf5-kpeople.spec | 42 ++++++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2dd1b84..bacc9f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1 @@
-/kpeople-5.8.0.tar.xz
-/kpeople-5.9.0.tar.xz
-/kpeople-5.10.0.tar.xz
-/kpeople-5.11.0.tar.xz
-/kpeople-5.12.0.tar.xz
-/kpeople-5.13.0.tar.xz
-/kpeople-5.14.0.tar.xz
-/kpeople-5.15.0.tar.xz
-/kpeople-5.16.0.tar.xz
-/kpeople-5.17.0.tar.xz
 /kpeople-5.18.0.tar.xz
diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index f8b97b4..7f31699 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -2,11 +2,11 @@
 
 Name:           kf5-%{framework}
 Version:        5.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 library for contact and people aggregation
 
 License:        LGPLv2+
-URL:            https://projects.kde.org/projects/frameworks/kpeople
+URL:            https://projects.kde.org/kpeople
 
 %global versiondir %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -17,19 +17,19 @@ URL:            https://projects.kde.org/projects/frameworks/kpeople
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
-## Once ktp-kf5 stack is ready, can consider Obsoletes
-#Obsoletes: libkpeople < 1.0
+%if 0%{?fedora} > 23
+Obsoletes: libkpeople < 1.0
+%endif
 
-BuildRequires:  kf5-rpm-macros >= %{version}
 BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  qt5-qtdeclarative-devel
-
 BuildRequires:  kf5-kcoreaddons-devel >= %{version}
-BuildRequires:  kf5-kservice-devel >= %{version}
-BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
 BuildRequires:  kf5-ki18n-devel >= %{version}
 BuildRequires:  kf5-kitemviews-devel >= %{version}
+BuildRequires:  kf5-kservice-devel >= %{version}
+BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
+BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtdeclarative-devel
 
 Requires:       kf5-filesystem >= %{version}
 
@@ -40,9 +40,9 @@ KDE Frameworks 5 Tier 3 library for interaction with XML RPC services.
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       qt5-qtbase-devel
-## enable when ktp-kf5 stack is updated
-#Obsoletes:      libkpeople-devel < 1.0
-
+%if 0%{?fedora} > 23
+Obsoletes:      libkpeople-devel < 1.0
+%endif
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -51,6 +51,7 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{framework}-%{version}
 
+
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
@@ -63,6 +64,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
 %find_lang kpeople5_qt --with-qt --all-name
 
 
@@ -70,25 +72,29 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %postun -p /sbin/ldconfig
 
 %files -f kpeople5_qt.lang
-%doc COPYING
+%doc README.md
+%license COPYING
 %{_kf5_libdir}/libKF5People.so.*
 %{_kf5_libdir}/libKF5PeopleWidgets.so.*
 %{_kf5_libdir}/libKF5PeopleBackend.so.*
+%{_kf5_datadir}/kf5/kpeople/
 %{_kf5_datadir}/kservicetypes5/*.desktop
-%{_kf5_qmldir}/org/kde/people
+%{_kf5_qmldir}/org/kde/people/
 
 %files devel
-%{_kf5_includedir}/KPeople
+%{_kf5_includedir}/KPeople/
 %{_kf5_libdir}/libKF5People.so
 %{_kf5_libdir}/libKF5PeopleWidgets.so
 %{_kf5_libdir}/libKF5PeopleBackend.so
-%{_kf5_libdir}/cmake/KF5People
-%{_kf5_datadir}/kf5/kpeople
+%{_kf5_libdir}/cmake/KF5People/
 %{_kf5_archdatadir}/mkspecs/modules/qt_KPeople.pri
 %{_kf5_archdatadir}/mkspecs/modules/qt_KPeopleWidgets.pri
 
 
 %changelog
+* Thu Jan 14 2016 Rex Dieter <rdieter@fedoraproject.org> 5.18.0-2
+- cosmetics, update URL, use %%license, Obsoletes: libkpeople (f24+)
+
 * Sun Jan 03 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.18.0-1
 - KDE Frameworks 5.18.0