diff --git a/kf5.spec b/kf5.spec index 12643f5..d1ebb8d 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,13 +1,15 @@ Name: kf5 Version: 5.5.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 Source0: macros.kf5 +# noarch -> arch transition +Obsoletes: kf5 < 5.5.0-2 + %description Filesystem and RPM macros for KDE Frameworks 5 @@ -18,13 +20,15 @@ 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/qt5/plugins/kf5 +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt5/plugins/kf5 mkdir -p %{buildroot}%{_includedir}/KF5 mkdir -p %{buildroot}%{_libexecdir}/kf5 @@ -33,7 +37,8 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %files filesystem -%{_libdir}/qt5/plugins/kf5 +%{_prefix}/lib/qt5/plugins/kf5 +%{_prefix}/%{_lib}/qt5/plugins/kf5 %{_includedir}/KF5 %{_libexecdir}/kf5 @@ -43,6 +48,9 @@ install -pm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d %changelog +* Thu Dec 18 2014 Rex Dieter 5.5.0-2 +- make pkg arch'd, own %%_prefix/%%_lib and %%_prefix/lib + * Thu Dec 11 2014 Daniel Vrátil - 5.5.0-1 - KDE Frameworks 5.5.0