From d9ffd53aa4a3bad2debcbf54df9d0803b8d998bb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 22 Oct 2018 16:31:35 -0500 Subject: [PATCH] pull in upstream fixes --- .gitignore | 3 +++ kf5-kiconthemes.spec | 10 +++++++++- sources | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index df7ff34..934d9e3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ /kiconthemes-5.49.0.tar.xz /kiconthemes-5.50.0.tar.xz /kiconthemes-5.51.0.tar.xz +/0001-Fixing-a-copy-paste-error.patch +/0004-Use-new-syntax.patch +/0005-Center-icons-properly-if-size-doesn-t-fit.patch diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index b54c354..85b3f1d 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.51.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -17,6 +17,11 @@ URL: https://api.kde.org/frameworks/kiconthemes/ %endif Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz +## upstream patches +Patch1: 0001-Fixing-a-copy-paste-error.patch +Patch4: 0004-Use-new-syntax.patch +Patch5: 0005-Center-icons-properly-if-size-doesn-t-fit.patch + BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-karchive-devel >= %{majmin} BuildRequires: kf5-kconfigwidgets-devel >= %{majmin} @@ -79,6 +84,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Oct 22 2018 Rex Dieter - 5.51.0-2 +- pull in upstream fixes + * Wed Oct 10 2018 Rex Dieter - 5.51.0-1 - 5.51.0 diff --git a/sources b/sources index 75b9368..35dce25 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ SHA512 (kiconthemes-5.51.0.tar.xz) = 3e71bc474d920eb31b37d8acb5360327e5676686d98e0f55251cfddba33c833547a330961e9479d6d6e1ac86bd631101c61d58ca865fa3f17b5a363ded939847 +SHA512 (0001-Fixing-a-copy-paste-error.patch) = c58875d2da8419ed9c2f3f744d8a8c499abb02d7c977f50ca12f0deeda08cbaab5c49b7ec691e33e5394ce115c4f4d3a70de608e41cae14b7f9b028bde2b3ccf +SHA512 (0004-Use-new-syntax.patch) = bd8e9fccc8a462136b75f891918880f52c370898da45e5389fb6a84c9ee5a592b1304076a7c54d703eaa1dbfaa284653f29318152500d2def4d5ff051b7b2453 +SHA512 (0005-Center-icons-properly-if-size-doesn-t-fit.patch) = abbe2f1f019ac58d8f54e78dcd3dc9527a31d0f15c52bea2ddc9d1f709b9b693df369ca70e7748b19ea29ed04d6ed8a07c02f0abe0ecc535c0e76a813813b571