From 68ef47eee4116faf8adff73bde0af9a47a6b5e37 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Fri, 3 May 2024 12:11:53 -0700 Subject: [PATCH] Backport changes from Fedora 40 Resolves: RHEL-32067 --- .gitignore | 1 + editorconfig.rpmlintrc | 7 +++---- editorconfig.spec | 7 +++++-- sources | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 22b8c75..1dde97d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /editorconfig-core-c-0.12.4.tar.gz /editorconfig-core-c-0.12.5.tar.gz /editorconfig-core-c-0.12.6.tar.gz +/editorconfig-core-c-0.12.7.tar.gz diff --git a/editorconfig.rpmlintrc b/editorconfig.rpmlintrc index 4109516..6877b3d 100644 --- a/editorconfig.rpmlintrc +++ b/editorconfig.rpmlintrc @@ -1,5 +1,4 @@ # don't care about these warnings -addFilter("editorconfig.src: W: name-repeated-in-summary C EditorConfig*") -addFilter("editorconfig.x86_64: W: name-repeated-in-summary C EditorConfig*") -addFilter("editorconfig.x86_64: W: no-manual-page-for-binary editorconfig-*") -addFilter("editorconfig-devel.x86_64: W: no-documentation*") +addFilter(r" name-repeated-in-summary EditorConfig") +addFilter(r" no-manual-page-for-binary editorconfig-") +addFilter(r"^editorconfig-devel\..+: no-documentation$") diff --git a/editorconfig.spec b/editorconfig.spec index 907132c..9ac347c 100644 --- a/editorconfig.spec +++ b/editorconfig.spec @@ -15,8 +15,8 @@ editors.} Name: editorconfig Summary: Parser for EditorConfig files written in C -Version: 0.12.6 -Release: 5%{?dist} +Version: 0.12.7 +Release: 1%{?dist} # The entire source is BSD-2-Clause, except: # BSD-3-Clause: src/lib/ini.h @@ -139,6 +139,9 @@ rm %{buildroot}/%{_libdir}/libeditorconfig_static.a %changelog +* Wed Apr 03 2024 Benjamin A. Beasley - 0.12.7-1 +- Update to 0.12.7 (close RHBZ#2272370) + * Fri Mar 08 2024 Yaakov Selkowitz - 0.12.6-5 - Use bundled uthash in RHEL builds diff --git a/sources b/sources index 827c547..5ccbf9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (editorconfig-core-c-0.12.6.tar.gz) = 7cf69ed48c0d28694fc1f54cd8ae89202a3f0a13b5302fd316f50d0f99a606f54af9709874f0da75ad11ab6f4cc36edacb4cd8639717d44842a309140be3a968 +SHA512 (editorconfig-core-c-0.12.7.tar.gz) = 37af762ca5b9a83cb9062457ab5dd354c883a4e71329e84f7f49516dad02c04f5105753ad1dbfc41d63aeb24bbbb0a1b6a2a84215fddf8c34e6cff46f3dcd656