From bbcb2b3e9420eb5ccff489d4ff53ae46002b0357 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 4 Sep 2018 13:30:13 -0500 Subject: [PATCH] 5.50 .spec cosmetics macros.kf5: use %_metainfodir explicitly --- kf5.spec | 31 ++++++++++++++++++------------- macros.kf5 | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/kf5.spec b/kf5.spec index df58760..212b24f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,25 +1,25 @@ -Name: kf5 -Version: 5.49.0 +Name: kf5 +Version: 5.50.0 Release: 1%{?dist} -Summary: Filesystem and RPM macros for KDE Frameworks 5 -License: BSD -URL: http://www.kde.org +Summary: Filesystem and RPM macros for KDE Frameworks 5 +License: BSD +URL: http://www.kde.org -Source0: macros.kf5 +Source0: macros.kf5 %description Filesystem and RPM macros for KDE Frameworks 5 -%package filesystem -Summary: Filesystem for KDE Frameworks 5 +%package filesystem +Summary: Filesystem for KDE Frameworks 5 # noarch -> arch transition -Obsoletes: kf5-filesystem < 5.10.0-2 +Obsoletes: kf5-filesystem < 5.10.0-2 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} -%description filesystem +%description filesystem Filesystem for KDE Frameworks 5. -%package rpm-macros -Summary: RPM macros for KDE Frameworks 5 +%package rpm-macros +Summary: RPM macros for KDE Frameworks 5 %if 0%{?fedora} || 0%{?rhel} > 7 Requires: cmake >= 3 Requires: qt5-rpm-macros @@ -30,7 +30,7 @@ Requires: qt5-qtbase-devel # misc build environment dependencies Requires: gcc-c++ BuildArch: noarch -%description rpm-macros +%description rpm-macros RPM macros for building KDE Frameworks 5 packages. @@ -80,6 +80,11 @@ sed -i \ %changelog +* Tue Sep 04 2018 Rex Dieter - 5.50.0-1 +- 5.50 +- .spec cosmetics +- macros.kf5: use %%_metainfodir explicitly + * Tue Aug 07 2018 Rex Dieter - 5.49.0-1 - 5.49.0 diff --git a/macros.kf5 b/macros.kf5 index 065491d..b4975ff 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -6,7 +6,7 @@ %_kf5_includedir %_includedir/KF5 %_kf5_libdir %_libdir %_kf5_libexecdir %_libexecdir/kf5 -%_kf5_metainfodir %_kf5_datadir/metainfo +%_kf5_metainfodir %_metainfodir %_kf5_qtplugindir %_qt5_plugindir %_kf5_plugindir %_qt5_plugindir/kf5 %_kf5_sysconfdir %_sysconfdir