From 16c132b7117731a2f4f77f6ea8ec670d43d1f5a2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 24 Apr 2020 10:56:15 -0500 Subject: [PATCH] pull in upstream fixes --- .gitignore | 2 ++ kf5-kbookmarks.spec | 9 ++++++++- sources | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9ac24b5..493c2ad 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /kbookmarks-5.67.0.tar.xz /kbookmarks-5.68.0.tar.xz /kbookmarks-5.69.0.tar.xz +/0002-KBookMarksMenu-Set-objectName-for-newBookmarkFolderA.patch +/0003-Always-create-actioncollection.patch diff --git a/kf5-kbookmarks.spec b/kf5-kbookmarks.spec index ede13af..ebf4bca 100644 --- a/kf5-kbookmarks.spec +++ b/kf5-kbookmarks.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.69.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 addon for bookmarks manipulation License: LGPLv2+ @@ -17,6 +17,10 @@ URL: https://cgit.kde.org/%{framework}.git %endif Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz +## upstream patches +Patch2: 0002-KBookMarksMenu-Set-objectName-for-newBookmarkFolderA.patch +Patch3: 0003-Always-create-actioncollection.patch + BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-rpm-macros BuildRequires: kf5-kcodecs-devel >= %{majmin} @@ -80,6 +84,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Apr 24 2020 Rex Dieter - 5.69.0-2 +- pull in upstream fixes + * Tue Apr 21 2020 Rex Dieter - 5.69.0-1 - 5.69.0 diff --git a/sources b/sources index ae88b1f..903d7f9 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (kbookmarks-5.69.0.tar.xz) = 9c13e15f63ac65215fb0517b781fc217f1e7fc4756a3faca1ce12a9de8cdf5d08094fce5a6dfddaacfe6a9718ba2f47ffce72b690a7903ab726af6e13056ec5a +SHA512 (0002-KBookMarksMenu-Set-objectName-for-newBookmarkFolderA.patch) = 99888f519e5c273a62998aa9a73050096c8797f337ec196bdc587b685fd186a128bc20660515831d2c752cd945950066858126b876158a0d9ca7d4d149f69345 +SHA512 (0003-Always-create-actioncollection.patch) = 09925e648677e64145dd4f66474e691d469c520bae8a77e2c88573f1c426e37bc7967887b32255a84a0fb16914426408710eabb5dc4a39fee8f9f9a97afced45