own %{_datadir}/kf5, make -filesystem arch'd

kf5.spec

@@ -1,8 +1,7 @@
 Name:           kf5
 Version:        5.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Filesystem and RPM macros for KDE Frameworks 5
-BuildArch:      noarch
 License:        BSD
 URL:            http://www.kde.org
 
@@ -13,39 +12,45 @@ Filesystem and RPM macros for KDE Frameworks 5
 
 %package        filesystem
 Summary:        Filesystem for KDE Frameworks 5
+# noarch -> arch transition
+Obsoletes:      kf5-filesystem < 5.10.0-2
 %description    filesystem
 Filesystem for KDE Frameworks 5.
 
 %package        rpm-macros
 Summary:        RPM macros for KDE Frameworks 5
+BuildArch: noarch
 %description    rpm-macros
 RPM macros for building KDE Frameworks 5 packages.
 
 
 %install
 # See macros.kf5 where the directories are specified
-mkdir -p %{buildroot}%{_libdir}/qt5/plugins/kf5
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/
 mkdir -p %{buildroot}%{_includedir}/KF5
+mkdir -p %{buildroot}%{_datadir}/kf5
 mkdir -p %{buildroot}%{_libexecdir}/kf5
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown}
 
-mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
-install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d
+install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
 
 
 %files filesystem
 %{_sysconfdir}/xdg/plasma-workspace/
-%{_prefix}/lib/qt5/plugins/kf5
-%{_prefix}/%{_lib}/qt5/plugins/kf5
-%{_includedir}/KF5
-%{_libexecdir}/kf5
-
+%{_prefix}/lib/qt5/plugins/kf5/
+%{_prefix}/%{_lib}/qt5/plugins/kf5/
+%{_includedir}/KF5/
+%{_libexecdir}/kf5/
+%{_datadir}/kf5/
 
 %files rpm-macros
 %{_rpmconfigdir}/macros.d/macros.kf5
 
 
 %changelog
+* Wed Jun 03 2015 Rex Dieter <rdieter@fedoraproject.org> 5.10.0-2
+- own %%{_datadir}/kf5, make -filesystem arch'd
+
 * Mon May 11 2015 Daniel Vrátil <dvratil@redhat.com> - 5.10.0-1
 - KDE Frameworks 5.10.0