From a4d54faf63712bbb47a87f7a656b3e8b08ab51b3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 9 Jul 2015 11:59:05 -0500
Subject: [PATCH] update url, own %{_kf5_datadir}/kf5/infopage, .spec cleanup,
 fix main/-libs deps

---
 kf5-frameworkintegration.spec | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/kf5-frameworkintegration.spec b/kf5-frameworkintegration.spec
index 7b82e6c..9335321 100644
--- a/kf5-frameworkintegration.spec
+++ b/kf5-frameworkintegration.spec
@@ -2,10 +2,10 @@
 
 Name:           kf5-%{framework}
 Version:        5.11.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        KDE Frameworks 5 Tier 4 workspace and cross-framework integration plugins
 License:        LGPLv2+
-URL:            http://www.kde.org
+URL:            https://projects.kde.org/projects/frameworks/frameworkintegration
 
 %global versiondir %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -38,6 +38,8 @@ BuildRequires:  libXcursor-devel
 Requires:       kf5-filesystem
 Requires:       oxygen-fonts
 
+# prior to 5.11.0-3, main pkg was multilib'd (due to arch'd -devel deps) -- rex
+Obsoletes:      %{name} < 5.11.0-3
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -48,14 +50,12 @@ Applications do not need to link to this directly.
 
 %package        libs
 Summary:        Runtime libraries for %{name}.
-# last version of the main package before the split
-Conflicts:      %{name} < 5.3.0-2
+Requires:       %{name} = %{version}-%{release}
 %description    libs
 %{summary}.
 
 %package        devel
 Summary:        Development files for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       kf5-kiconthemes-devel
 Requires:       kf5-kconfigwidgets-devel
@@ -68,14 +68,16 @@ developing applications that use %{name}.
 %prep
 %autosetup -p1 -n %{framework}-%{version}
 
+
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang frameworkintegration5_qt --with-qt --all-name
@@ -83,8 +85,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %files -f frameworkintegration5_qt.lang
 %doc COPYING.LIB README.md
-%{_kf5_datadir}/kf5/infopage/*
+%{_kf5_datadir}/kf5/infopage/
 %{_kf5_datadir}/knotifications5/plasma_workspace.notifyrc
+# move these to -libs? or just fold -libs back into main pkg ? -- rex
 %{_kf5_plugindir}/FrameworkIntegrationPlugin.so
 %{_kf5_qtplugindir}/platformthemes/KDEPlatformTheme.so
 
@@ -96,12 +99,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %files devel
 %{_kf5_includedir}/frameworkintegration_version.h
-%{_kf5_includedir}/KStyle
+%{_kf5_includedir}/KStyle/
 %{_kf5_libdir}/libKF5Style.so
-%{_kf5_libdir}/cmake/KF5FrameworkIntegration
+%{_kf5_libdir}/cmake/KF5FrameworkIntegration/
 
 
 %changelog
+* Thu Jul 09 2015 Rex Dieter <rdieter@fedoraproject.org> 5.11.0-3
+- update url, own %%{_kf5_datadir}/kf5/infopage, .spec cleanup, fix main/-libs deps
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild