From a0eb57b1e7781aa558da4ce5b49f81b500336842 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Jan 2018 12:25:58 -0600 Subject: [PATCH] kf5-rpm-macros: fix %_kf5_metainfodir macro for < f28 (#1532930) --- kf5.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index c71706f..77def08 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.42.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -50,6 +50,13 @@ sed -i \ -e "s|@@KF5_VERSION@@|%{version}|g" \ %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 +# stick to legacy appdata dir for < f28, use metainfo for new releases only +%if 0%{?fedora} && %{fedora} < 28 +sed -i \ + -e 's|^%%_kf5_metainfodir.*|%%_kf5_metainfodir %%_kf5_datadir/appdata|g' \ + %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 +%endif + %files filesystem %{_sysconfdir}/xdg/plasma-workspace/ @@ -71,6 +78,9 @@ sed -i \ %changelog +* Wed Jan 10 2018 Rex Dieter - 5.42.0-2 +- kf5-rpm-macros: fix %%_kf5_metainfodir macro for < f28 (#1532930) + * Mon Jan 08 2018 Rex Dieter - 5.42.0-1 - 5.42.0