From 58aa8ad400c0703b1125c04057c9cb1a51488e83 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 14 Jan 2016 12:09:30 -0600 Subject: [PATCH] cosmetics, -BR: cmake, update URL --- .gitignore | 3 --- kf5-kservice.spec | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 8035594..afb1d71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/kservice-5.15.0.tar.xz -/kservice-5.16.0.tar.xz -/kservice-5.17.0.tar.xz /kservice-5.18.0.tar.xz diff --git a/kf5-kservice.spec b/kf5-kservice.spec index aad5bf3..e648396 100644 --- a/kf5-kservice.spec +++ b/kf5-kservice.spec @@ -3,11 +3,11 @@ Name: kf5-%{framework} Summary: KDE Frameworks 5 Tier 3 solution for advanced plugin and service introspection Version: 5.18.0 -Release: 1%{?dist} +Release: 2%{?dist} # mixture of LGPLv2 and LGPLv2+ (mostly the latter) License: LGPLv2 -URL: https://projects.kde.org/projects/frameworks/kservice +URL: https://projects.kde.org/kservice %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -16,21 +16,19 @@ URL: https://projects.kde.org/projects/frameworks/kservice %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +## downstream patches # Fedora customizations to the menu categories # adds the Administration menu from redhat-menus which equals System + Settings # This prevents the stuff getting listed twice, under both System and Settings. -Patch0: kservice-5.15.0-xdg-menu.patch +Patch0: kservice-5.15.0-xdg-menu.patch # kbuildsycoca5 always gives: # kf5.kservice.sycoca: Parse error in "$HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu" , line 1 , col 1 : "unexpected end of file" # hide that by default, make it qCDebug instead (of qCWarning) -Patch1: kservice-5.17.0-vfolder_spam.patch +Patch1: kservice-5.17.0-vfolder_spam.patch -## upstream patches - -BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-kconfig-devel >= %{version} BuildRequires: kf5-kcoreaddons-devel >= %{version} @@ -74,6 +72,7 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + %find_lang kservice5_qt --with-man --with-qt --all-name mv %{buildroot}%{_kf5_sysconfdir}/xdg/menus/applications.menu %{buildroot}/%{_kf5_sysconfdir}/xdg/menus/kf5-applications.menu @@ -105,6 +104,9 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kservicetypes5 %changelog +* Thu Jan 14 2016 Rex Dieter 5.18.0-2 +- cosmetics, -BR: cmake, update URL + * Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 - KDE Frameworks 5.18.0