From 37eb51f356e205f7ffdd2d261344c885e0d7777e Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Wed, 20 Mar 2019 16:58:40 +0000 Subject: [PATCH 01/38] Patch esc.style to avoid using the black color (#1688372) --- source-highlight-3.1.8-no-black.patch | 12 ++++++++++++ source-highlight.spec | 9 +++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 source-highlight-3.1.8-no-black.patch diff --git a/source-highlight-3.1.8-no-black.patch b/source-highlight-3.1.8-no-black.patch new file mode 100644 index 0000000..b673c2f --- /dev/null +++ b/source-highlight-3.1.8-no-black.patch @@ -0,0 +1,12 @@ +diff -up source-highlight-3.1.8/src/esc.style.no-black source-highlight-3.1.8/src/esc.style +--- source-highlight-3.1.8/src/esc.style.no-black 2019-03-20 16:52:33.053965325 +0000 ++++ source-highlight-3.1.8/src/esc.style 2019-03-20 16:52:42.502965289 +0000 +@@ -7,7 +7,7 @@ comment cyan i ; + number purple ; + preproc darkblue b ; + symbol darkred ; +-function black b; ++function b; + cbracket red; + variable darkgreen ; + diff --git a/source-highlight.spec b/source-highlight.spec index 9681743..37dbe4c 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,10 +1,12 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.8 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig +# Fix for https://savannah.gnu.org/bugs/index.php?55967 +Patch: source-highlight-3.1.8-no-black.patch URL: http://www.gnu.org/software/src-highlite/ BuildRequires: bison, flex, boost-devel BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion) @@ -29,7 +31,7 @@ Requires: boost-devel Development files for source-highlight %prep -%setup -q +%autosetup -p1 %build %configure --disable-static \ @@ -79,6 +81,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Wed Mar 20 2019 fedora-toolbox - 3.1.8-24 +- Patch esc.style to avoid using the black color (#1688372) + * Mon Feb 18 2019 Adrian Reber - 3.1.8-23 - Require boost-devel in the source-highlight-devel package (#1638029) From 7f14e26a742dbeca92f8bd5cbe0c4266e514ed1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:46:05 +0000 Subject: [PATCH 02/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 37dbe4c..686b86c 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.8 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -81,6 +81,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 3.1.8-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Mar 20 2019 fedora-toolbox - 3.1.8-24 - Patch esc.style to avoid using the black color (#1688372) From 9e6b0cc8a06d89041f647591428c5576422bcd2a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 12 Oct 2019 09:47:40 -0600 Subject: [PATCH 03/38] Update to 3.1.9 --- .gitignore | 2 ++ source-highlight.spec | 9 +++++---- sources | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 388adde..6a0aaa2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ source-highlight-3.1.4.tar.gz /source-highlight-3.1.7.tar.gz.sig /source-highlight-3.1.8.tar.gz /source-highlight-3.1.8.tar.gz.sig +/source-highlight-3.1.9.tar.gz +/source-highlight-3.1.9.tar.gz.sig diff --git a/source-highlight.spec b/source-highlight.spec index 686b86c..83c9d0d 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,12 +1,10 @@ Summary: Produces a document with syntax highlighting Name: source-highlight -Version: 3.1.8 -Release: 25%{?dist} +Version: 3.1.9 +Release: 1%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig -# Fix for https://savannah.gnu.org/bugs/index.php?55967 -Patch: source-highlight-3.1.8-no-black.patch URL: http://www.gnu.org/software/src-highlite/ BuildRequires: bison, flex, boost-devel BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion) @@ -81,6 +79,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sat Oct 12 2019 Orion Poplawski - 3.1.9-1 +- Update to 3.1.9 + * Fri Jul 26 2019 Fedora Release Engineering - 3.1.8-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a0ae5d6..e75221b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3243470706ef5fefdc3e43b5306a4e41 source-highlight-3.1.8.tar.gz -fec14cd26148f53d05f26b9ecda1fe4c source-highlight-3.1.8.tar.gz.sig +SHA512 (source-highlight-3.1.9.tar.gz) = d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195 +SHA512 (source-highlight-3.1.9.tar.gz.sig) = a0bbee3dda6e97fb82c5a455a161030d3b5d053606b0b455de504714a2e2b088af920b86ef340546bdeef79156bedc5e9e4b8911f2c066e0e172eb7dc805b9a6 From de02c7eaa4a98723eb4d3447f631522bb9a15f72 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 12 Oct 2019 09:54:21 -0600 Subject: [PATCH 04/38] Remove old patch --- source-highlight-3.1.8-no-black.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 source-highlight-3.1.8-no-black.patch diff --git a/source-highlight-3.1.8-no-black.patch b/source-highlight-3.1.8-no-black.patch deleted file mode 100644 index b673c2f..0000000 --- a/source-highlight-3.1.8-no-black.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up source-highlight-3.1.8/src/esc.style.no-black source-highlight-3.1.8/src/esc.style ---- source-highlight-3.1.8/src/esc.style.no-black 2019-03-20 16:52:33.053965325 +0000 -+++ source-highlight-3.1.8/src/esc.style 2019-03-20 16:52:42.502965289 +0000 -@@ -7,7 +7,7 @@ comment cyan i ; - number purple ; - preproc darkblue b ; - symbol darkred ; --function black b; -+function b; - cbracket red; - variable darkgreen ; - From b7428b9d219fe8266736a18b2501bce8d2532da2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:55:42 +0000 Subject: [PATCH 05/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 83c9d0d..4e4a073 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -79,6 +79,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Oct 12 2019 Orion Poplawski - 3.1.9-1 - Update to 3.1.9 From 8492ea50a97b965f8fa1431b3f9e1349f942ee67 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 28 May 2020 18:36:46 +0100 Subject: [PATCH 06/38] Rebuilt for Boost 1.73 --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 4e4a073..ad5d37d 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -79,6 +79,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Thu May 28 2020 Jonathan Wakely - 3.1.9-3 +- Rebuilt for Boost 1.73 + * Thu Jan 30 2020 Fedora Release Engineering - 3.1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e28e70ae57908dd7b7b94710fdae81ccee4664b8 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 28 Jul 2020 21:15:56 -0600 Subject: [PATCH 07/38] Force C++14 as this code is not C++17 ready --- source-highlight.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index ad5d37d..acd768e 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -32,6 +32,7 @@ Development files for source-highlight %autosetup -p1 %build +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %configure --disable-static \ --with-boost-regex=boost_regex %make_build @@ -79,6 +80,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Tue Jul 28 2020 Jeff Law - 3.1.9-4 +- Force C++14 as this code is not C++17 ready + * Thu May 28 2020 Jonathan Wakely - 3.1.9-3 - Rebuilt for Boost 1.73 From 43a1e8ca48dbb7ae99884de4008b2661bc92503f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:10:02 +0000 Subject: [PATCH 08/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index acd768e..9d9893c 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -80,6 +80,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.1.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Jeff Law - 3.1.9-4 - Force C++14 as this code is not C++17 ready From 21dbadd99766cb6b9b7c009a2feb291b679b8085 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Fri, 8 Jan 2021 08:51:08 -0800 Subject: [PATCH 09/38] Disable ctags support for RHEL9+ --- source-highlight.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/source-highlight.spec b/source-highlight.spec index 9d9893c..5208ab8 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,15 +1,18 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ BuildRequires: bison, flex, boost-devel -BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion) +BuildRequires: help2man, chrpath, pkgconfig(bash-completion) BuildRequires: gcc, gcc-c++ +%if 0%{!?rhel:1} || 0%{?rhel} < 9 +BuildRequires: ctags Requires: ctags +%endif %description This program, given a source file, produces a document with syntax @@ -33,6 +36,9 @@ Development files for source-highlight %build export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" +%if 0%{?rhel} > 8 +export CTAGS=do_not_use_ctags +%endif %configure --disable-static \ --with-boost-regex=boost_regex %make_build @@ -80,6 +86,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Wed Jan 6 2021 Keith Seitz - 3.1.9-6 +- Disable ctags support for RHEL9+. + * Wed Jul 29 2020 Fedora Release Engineering - 3.1.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 17e2875d2ec71b6fc4d28494fd0aa455ef7fc868 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:45:22 +0000 Subject: [PATCH 10/38] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- source-highlight.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/source-highlight.spec b/source-highlight.spec index 5208ab8..a1bbddf 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -6,6 +6,7 @@ License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ +BuildRequires: make BuildRequires: bison, flex, boost-devel BuildRequires: help2man, chrpath, pkgconfig(bash-completion) BuildRequires: gcc, gcc-c++ From 2777cf6725efd9584fb6bce66e164f79e9934d0f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 20:53:49 +0000 Subject: [PATCH 11/38] Rebuilt for Boost 1.75 --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index a1bbddf..d8d380d 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Fri Jan 22 2021 Jonathan Wakely - 3.1.9-7 +- Rebuilt for Boost 1.75 + * Wed Jan 6 2021 Keith Seitz - 3.1.9-6 - Disable ctags support for RHEL9+. From f1da17b567c4a8c805e9235deb32bf05e6d456c3 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 25 Jan 2021 11:27:17 -0800 Subject: [PATCH 12/38] mini-bump for eln build --- source-highlight.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index d8d380d..ee11273 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 7%{?dist} +Release: 7.1%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig From 61635937506043cb025d6714c7fa9c6ef6ae82c4 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 25 Jan 2021 11:33:35 -0800 Subject: [PATCH 13/38] undo mini-bump --- source-highlight.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index ee11273..d8d380d 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 7.1%{?dist} +Release: 7%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig From 828d18413464c5e8b23dd12770319f061ce881fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:46:12 +0000 Subject: [PATCH 14/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index d8d380d..6c3b35f 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.1.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Jonathan Wakely - 3.1.9-7 - Rebuilt for Boost 1.75 From d14afcb392c86e7514e5d5a533cfa23ec4c87116 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Wed, 24 Mar 2021 21:48:39 +0000 Subject: [PATCH 15/38] init FMF CI gating --- .fmf/version | 1 + gating.yaml | 20 +++++ plans/ci.fmf | 6 ++ tests/source-highlight-testsuite/Makefile | 63 ++++++++++++++++ tests/source-highlight-testsuite/PURPOSE | 3 + tests/source-highlight-testsuite/main.fmf | 16 ++++ tests/source-highlight-testsuite/runtest.sh | 82 +++++++++++++++++++++ 7 files changed, 191 insertions(+) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/ci.fmf create mode 100644 tests/source-highlight-testsuite/Makefile create mode 100644 tests/source-highlight-testsuite/PURPOSE create mode 100644 tests/source-highlight-testsuite/main.fmf create mode 100755 tests/source-highlight-testsuite/runtest.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..84b7773 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,20 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation} +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..1ad2c12 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + directory: tests +execute: + how: beakerlib diff --git a/tests/source-highlight-testsuite/Makefile b/tests/source-highlight-testsuite/Makefile new file mode 100644 index 0000000..252ffaa --- /dev/null +++ b/tests/source-highlight-testsuite/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /tools/source-highlight/Sanity/source-highlight-testsuite +# Description: source-highlight testing by upstream testsuite +# Author: Michal Kolar +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2021 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/tools/source-highlight/Sanity/source-highlight-testsuite +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Michal Kolar " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: source-highlight testing by upstream testsuite" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 30m" >> $(METADATA) + @echo "RunFor: source-highlight" >> $(METADATA) + @echo "Requires: source-highlight rpm-build yum-utils gcc-c++" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2+" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/source-highlight-testsuite/PURPOSE b/tests/source-highlight-testsuite/PURPOSE new file mode 100644 index 0000000..27ef088 --- /dev/null +++ b/tests/source-highlight-testsuite/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /tools/source-highlight/Sanity/source-highlight-testsuite +Description: source-highlight testing by upstream testsuite +Author: Michal Kolar diff --git a/tests/source-highlight-testsuite/main.fmf b/tests/source-highlight-testsuite/main.fmf new file mode 100644 index 0000000..850006d --- /dev/null +++ b/tests/source-highlight-testsuite/main.fmf @@ -0,0 +1,16 @@ +summary: source-highlight testing by upstream testsuite +description: '' +contact: +- Michal Kolar +component: +- source-highlight +test: ./runtest.sh +framework: beakerlib +recommend: +- source-highlight +- rpm-build +- yum-utils +- gcc-c++ +duration: 30m +extra-summary: /tools/source-highlight/Sanity/source-highlight-testsuite +extra-task: /tools/source-highlight/Sanity/source-highlight-testsuite diff --git a/tests/source-highlight-testsuite/runtest.sh b/tests/source-highlight-testsuite/runtest.sh new file mode 100755 index 0000000..a1e047d --- /dev/null +++ b/tests/source-highlight-testsuite/runtest.sh @@ -0,0 +1,82 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /tools/source-highlight/Sanity/source-highlight-testsuite +# Description: source-highlight testing by upstream testsuite +# Author: Michal Kolar +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2021 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +BUILD_USER=${BUILD_USER:-srchghlghtbld} +TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-100} +PACKAGE="source-highlight" +REQUIRES="$PACKAGE rpm-build gcc-c++" +if rlIsFedora; then + REQUIRES="$REQUIRES dnf-utils" +else + REQUIRES="$REQUIRES yum-utils" +fi + +rlJournalStart + rlPhaseStartSetup + rlShowRunningKernel + rlAssertRpm --all + rlRun "TmpDir=\$(mktemp -d)" + rlRun "pushd $TmpDir" + rlFetchSrcForInstalled $PACKAGE + rlRun "useradd -M -N $BUILD_USER" 0,9 + [ "$?" == "0" ] && rlRun "del=yes" + rlRun "chown -R $BUILD_USER:users $TmpDir" + rlPhaseEnd + + rlPhaseStartSetup "build source-highlight" + rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm" + rlRun "yum-builddep -y $TmpDir/SPECS/*.spec" + rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" + rlRun "rlFileSubmit $TmpDir/rpmbuild.log" + rlRun "cd $TmpDir/BUILD/source-highlight-*" + rlRun "su -c './configure --build=`arch`-redhat-linux-gnu &>$TmpDir/configure.log' $BUILD_USER" + rlRun "rlFileSubmit $TmpDir/configure.log" + rlRun "cd tests" + rlPhaseEnd + + rlPhaseStartTest "run testsuite" + rlRun "su -c 'make -k PROGEXE=`which source-highlight` check &>$TmpDir/testsuite.log' $BUILD_USER" + rlRun "rlFileSubmit $TmpDir/testsuite.log" + rlPhaseEnd + + rlPhaseStartTest "evaluate results" + rlRun "cd $TmpDir" + rlRun "grep -E 'Makefile.+Error' testsuite.log" 1 + rlRun "tests_count=\$(grep -E '^`which source-highlight`' testsuite.log | wc -l)" + [ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" + [ "$del" == "yes" ] && rlRun "userdel $BUILD_USER" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd From b015c2d9e7a7386c5b2fa532cf1e1158093d1e69 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:36:51 +0100 Subject: [PATCH 16/38] Rebuilt for removed libstdc++ symbol (#1937698) --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 6c3b35f..1de69a0 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Tue Mar 30 2021 Jonathan Wakely - 3.1.9-9 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Wed Jan 27 2021 Fedora Release Engineering - 3.1.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 68cf369c874905e459d1cfabe504fa07ffb44729 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Sun, 23 May 2021 13:52:48 +0000 Subject: [PATCH 17/38] drop unwanted scratch build rule for gating --- gating.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 84b7773..ce3cdc1 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,7 +5,6 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation} --- !Policy product_versions: - rhel-8 From 7c1ff35fb2eb3537c43a81b60ab9ee5845ac6dae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:58:32 +0000 Subject: [PATCH 18/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 1de69a0..ea726a6 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.1.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 30 2021 Jonathan Wakely - 3.1.9-9 - Rebuilt for removed libstdc++ symbol (#1937698) From abc8f55531992554b79f928907ba70dfd82575a9 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 7 Aug 2021 00:03:56 +0100 Subject: [PATCH 19/38] Rebuilt for Boost 1.76 --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index ea726a6..a6a12e7 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Fri Aug 06 2021 Jonathan Wakely - 3.1.9-11 +- Rebuilt for Boost 1.76 + * Fri Jul 23 2021 Fedora Release Engineering - 3.1.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 14cc3a1e1fb5d65dfb068bd69e683f5e4f54fefd Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 11 Aug 2021 15:06:50 -0400 Subject: [PATCH 20/38] Rebuild for Boost 1.76 in ELN Signed-off-by: Stephen Gallagher --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index a6a12e7..5cbf3c4 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 11%{?dist} +Release: 11%{?dist}.1 License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Wed Aug 11 2021 Stephen Gallagher - 3.1.9-11.1 +- Rebuild for Boost 1.76 in ELN + * Fri Aug 06 2021 Jonathan Wakely - 3.1.9-11 - Rebuilt for Boost 1.76 From 3e7ca679ecb8edef2b6fc2fcc3a85daca7475aa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:20:30 +0000 Subject: [PATCH 21/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 5cbf3c4..0202630 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 11%{?dist}.1 +Release: 12%{?dist}.1 License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.1.9-12.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Aug 11 2021 Stephen Gallagher - 3.1.9-11.1 - Rebuild for Boost 1.76 in ELN From a9a13dde0842f36bd28e7c043b29f5e2ca2cbb8a Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:42:00 +0200 Subject: [PATCH 22/38] Rebuilt for Boost 1.78 --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 0202630..470db09 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 12%{?dist}.1 +Release: 13%{?dist}.1 License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Wed May 04 2022 Thomas Rodgers - 3.1.9-13.1 +- Rebuilt for Boost 1.78 + * Sat Jan 22 2022 Fedora Release Engineering - 3.1.9-12.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a7cb5c448d1306b8a4d34cd430baf139d7747e94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:04:58 +0000 Subject: [PATCH 23/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 470db09..34af058 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 13%{?dist}.1 +Release: 14%{?dist}.1 License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -87,6 +87,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.1.9-14.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed May 04 2022 Thomas Rodgers - 3.1.9-13.1 - Rebuilt for Boost 1.78 From cdc578d87f69432f2a33d940ba10261f29c49554 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 6 Oct 2022 14:55:25 +0200 Subject: [PATCH 24/38] Added upstream patch to fix #2131454 Signed-off-by: Adrian Reber --- ...49c9026cb772dc93fbe0947a252ef47127f4.patch | 42 +++++++++++++++++++ source-highlight.spec | 8 +++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 904949c9026cb772dc93fbe0947a252ef47127f4.patch diff --git a/904949c9026cb772dc93fbe0947a252ef47127f4.patch b/904949c9026cb772dc93fbe0947a252ef47127f4.patch new file mode 100644 index 0000000..8cf9234 --- /dev/null +++ b/904949c9026cb772dc93fbe0947a252ef47127f4.patch @@ -0,0 +1,42 @@ +From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001 +From: Tom Tromey +Date: Wed, 10 Jun 2020 20:38:27 -0600 +Subject: Remove "throw" specifications + +C++ throw specifications were deprecated in C++11. +This patch removes them from the library. +--- + ChangeLog | 5 +++++ + lib/srchilite/fileutil.cc | 2 +- + lib/srchilite/fileutil.h | 2 +- + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc +index 59a6d64..963178c 100644 +--- a/lib/srchilite/fileutil.cc ++++ b/lib/srchilite/fileutil.cc +@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) { + // FIXME avoid using a global variable + std::string start_path; + +-string readFile(const string &fileName) throw (IOException) { ++string readFile(const string &fileName) { + ifstream file(fileName.c_str()); + + if (!file.is_open()) { +diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h +index 7335a9b..042eb56 100644 +--- a/lib/srchilite/fileutil.h ++++ b/lib/srchilite/fileutil.h +@@ -27,7 +27,7 @@ extern std::string start_path; + * @return the contents of the file + * @throw IOException + */ +-string readFile(const string &fileName) throw (IOException); ++string readFile(const string &fileName); + + //char *read_file(const string &fileName); + +-- +cgit v1.1 + diff --git a/source-highlight.spec b/source-highlight.spec index 34af058..498201f 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,11 +1,14 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 14%{?dist}.1 +Release: 15%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ +# Taken from https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4 +# and slightly adapted +Patch0: 904949c9026cb772dc93fbe0947a252ef47127f4.patch BuildRequires: make BuildRequires: bison, flex, boost-devel BuildRequires: help2man, chrpath, pkgconfig(bash-completion) @@ -87,6 +90,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Thu Oct 06 2022 Adrian Reber - 3.1.9-15 +- Added upstream patch to fix #2131454 + * Sat Jul 23 2022 Fedora Release Engineering - 3.1.9-14.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 4ea2a1abbaf5bc1bec3096eee12f13694c1c6492 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:43:24 +0000 Subject: [PATCH 25/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 498201f..b0cbaaa 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -90,6 +90,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.1.9-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Oct 06 2022 Adrian Reber - 3.1.9-15 - Added upstream patch to fix #2131454 From 75c399a21eff7bed02bde916dd4fa2a7ad9ed2e4 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sun, 16 Oct 2022 19:22:25 -0400 Subject: [PATCH 26/38] Add 'rpm-spec' language mapping Also drop addition of 'cxx' mapping, fixed upstream. --- source-highlight.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source-highlight.spec b/source-highlight.spec index b0cbaaa..95c1ffd 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -59,7 +59,11 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight-settings -echo -e "\ncxx = cpp.lang" >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map +# Submitted and accepted upstream: +# https://savannah.gnu.org/bugs/index.php?63225 +# This can be removed upon next release after 3.1.9 +echo -e >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map \ +"\nrpm-spec = spec.lang\n" bashcompdir=$(pkg-config --variable=completionsdir bash-completion) mkdir -p $RPM_BUILD_ROOT$bashcompdir @@ -90,6 +94,10 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sat Oct 15 2022 FeRD (Frank Dana) - 3.1.9-17 +- Stop adding 'cxx' language mapping (fixed upstream) +- Add 'rpm-spec' (used in asciidoc) mapping + * Sat Jan 21 2023 Fedora Release Engineering - 3.1.9-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From dfd3117c8d5e97b10d5921761811effdd0611ae0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 22:07:11 +0000 Subject: [PATCH 27/38] Rebuilt for Boost 1.81 --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 95c1ffd..1e058b4 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -94,6 +94,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Mon Feb 20 2023 Jonathan Wakely - 3.1.9-18 +- Rebuilt for Boost 1.81 + * Sat Oct 15 2022 FeRD (Frank Dana) - 3.1.9-17 - Stop adding 'cxx' language mapping (fixed upstream) - Add 'rpm-spec' (used in asciidoc) mapping From 8575fe6860274258074d3495af75b134e6739bf0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:10:17 +0000 Subject: [PATCH 28/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 1e058b4..4921bfe 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv3+ Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -94,6 +94,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.1.9-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Feb 20 2023 Jonathan Wakely - 3.1.9-18 - Rebuilt for Boost 1.81 From fdf2136ab936a57c7244a961d3c40d3868c73061 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Fri, 25 Aug 2023 12:20:54 -0700 Subject: [PATCH 29/38] Migrate to SPDX license Licenses used by the files in this package: GFDL-1.1-or-later LicenseRef-Fedora-Public-Domain (see fedora-license-data commit 0b3b008da8701c3ca528eb41f9998097b4dbe3d2) GPL-2.0-only (some test files shipped with binary RPM) GPL-3.0-or-later GPL-3.0-or-later WITH Bison-exception-2.2 (srchilite/*parser.{h,cc}) --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 4921bfe..1b25db3 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -2,7 +2,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 Release: 19%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ @@ -94,6 +94,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Fri Aug 25 2023 Keith Seitz +- migrated to SPDX license + * Sat Jul 22 2023 Fedora Release Engineering - 3.1.9-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5afd974ee7cc7a13b2e5c3543cda9a243286f519 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 17 Jan 2024 22:58:47 +0000 Subject: [PATCH 30/38] Rebuilt for Boost 1.83 --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 1b25db3..79e3a0c 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -94,6 +94,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Wed Jan 17 2024 Jonathan Wakely - 3.1.9-20 +- Rebuilt for Boost 1.83 + * Fri Aug 25 2023 Keith Seitz - migrated to SPDX license From 68c1ec65dbb37bad4d3fa479684ee391dd80edef Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 19 Jan 2024 00:23:29 +0000 Subject: [PATCH 31/38] Fix CI gating plan Remove obsolete options. --- plans/ci.fmf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..3fd3ab7 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,5 @@ summary: CI Gating Plan discover: how: fmf - directory: tests execute: - how: beakerlib + how: tmt From 72ffdf0491ebd5f64fc30551c705a7177a3f99f8 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Mon, 22 Jan 2024 10:10:16 -0800 Subject: [PATCH 32/38] Backport upstream fix for "lesspipe may contain ".sh" extension" Also use commit date for "Oct 15 2022 - 3.1.9-17" commit to quash rpmlint error. Resolves: BZ 2256374 --- source-highlight-bz2256374-lesspipe_sh.patch | 39 ++++++++++++++++++++ source-highlight.spec | 8 +++- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 source-highlight-bz2256374-lesspipe_sh.patch diff --git a/source-highlight-bz2256374-lesspipe_sh.patch b/source-highlight-bz2256374-lesspipe_sh.patch new file mode 100644 index 0000000..b490cb2 --- /dev/null +++ b/source-highlight-bz2256374-lesspipe_sh.patch @@ -0,0 +1,39 @@ +commit 8be2bee7f6861fd27d5c181b15d3126fc7dbf73b +Author: Keith Seitz +Date: Sat Jan 20 09:25:05 2024 -0700 + + lesspipe may contain ".sh" extension + + On Fedora, the "lesspipe" script is actually called + "lesspipe.sh". This patch proposes to use "$(which NAME)" + to figure out the actual name of the script to use. + + If neither "lesspipe" nor "lesspipe.sh" exists in $PATH, + the patch simply uses "lesspipe", preserving the current behavior. + + It was based on the 3.1.9 release tarball, but should + apply cleanly to current git. + + This was reported as Fedora bugzilla 2256374. + +diff --git a/src/src-hilite-lesspipe.sh.in b/src/src-hilite-lesspipe.sh.in +index eb5c3ee..76231c7 100644 +--- a/src/src-hilite-lesspipe.sh.in ++++ b/src/src-hilite-lesspipe.sh.in +@@ -7,7 +7,15 @@ for source in "$@"; do + *Makefile|*makefile) + source-highlight --failsafe -f esc --lang-def=makefile.lang --style-file=esc.style -i "$source" ;; + *.tar|*.tgz|*.gz|*.bz2|*.xz) +- lesspipe "$source" ;; ++ # The "lesspipe" script may or may not have ".sh" extension. ++ lesspipe=$(which lesspipe 2>/dev/null) ++ if [ -z "$lesspipe" ]; then ++ lesspipe=$(which lesspipe.sh 2>/dev/null) ++ if [ -z "$lesspipe" ]; then ++ lesspipe="lesspipe" ++ fi ++ fi ++ $lesspipe "$source" ;; + *) source-highlight --failsafe --infer-lang -f esc --style-file=esc.style -i "$source" ;; + esac + done diff --git a/source-highlight.spec b/source-highlight.spec index 79e3a0c..42f1b22 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -9,6 +9,7 @@ URL: http://www.gnu.org/software/src-highlite/ # Taken from https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4 # and slightly adapted Patch0: 904949c9026cb772dc93fbe0947a252ef47127f4.patch +Patch1: source-highlight-bz2256374-lesspipe_sh.patch BuildRequires: make BuildRequires: bison, flex, boost-devel BuildRequires: help2man, chrpath, pkgconfig(bash-completion) @@ -94,6 +95,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Mon Jan 22 2024 Keith Seitz - 3.1.9-21 +- Added upstream patch to fix BZ 2256374. + * Wed Jan 17 2024 Jonathan Wakely - 3.1.9-20 - Rebuilt for Boost 1.83 @@ -106,7 +110,7 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d * Mon Feb 20 2023 Jonathan Wakely - 3.1.9-18 - Rebuilt for Boost 1.81 -* Sat Oct 15 2022 FeRD (Frank Dana) - 3.1.9-17 +* Sun Jan 29 2023 FeRD (Frank Dana) - 3.1.9-17 - Stop adding 'cxx' language mapping (fixed upstream) - Add 'rpm-spec' (used in asciidoc) mapping From 437180078169596682b138fff2030b5e2af5d9ca Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Wed, 24 Jan 2024 11:34:27 +0000 Subject: [PATCH 33/38] tests/source-highlight-testsuite: adapt to rpm package > 4.18.91 --- tests/source-highlight-testsuite/runtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/source-highlight-testsuite/runtest.sh b/tests/source-highlight-testsuite/runtest.sh index a1e047d..877d4ee 100755 --- a/tests/source-highlight-testsuite/runtest.sh +++ b/tests/source-highlight-testsuite/runtest.sh @@ -53,7 +53,7 @@ rlJournalStart rlPhaseStartSetup "build source-highlight" rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm" rlRun "yum-builddep -y $TmpDir/SPECS/*.spec" - rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" + rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp --undefine specpartsdir $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" rlRun "cd $TmpDir/BUILD/source-highlight-*" rlRun "su -c './configure --build=`arch`-redhat-linux-gnu &>$TmpDir/configure.log' $BUILD_USER" From f9e5d87e998ff3c61cb9eb9f77e8084aa6467d81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:57:57 +0000 Subject: [PATCH 34/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 42f1b22..31b9aaa 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 21%{?dist} +Release: 22%{?dist} License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -95,6 +95,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.1.9-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Keith Seitz - 3.1.9-21 - Added upstream patch to fix BZ 2256374. From 0895a52eb54551d076449d80825bcd3442ebf155 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:06:00 +0000 Subject: [PATCH 35/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 31b9aaa..6c8a166 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 22%{?dist} +Release: 23%{?dist} License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -95,6 +95,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.1.9-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 3.1.9-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7b852ade4c7451017cb1ddcd244982574307201e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:15:52 +0000 Subject: [PATCH 36/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 6c8a166..9bbdb62 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 23%{?dist} +Release: 24%{?dist} License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -95,6 +95,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.1.9-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 3.1.9-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 504f777d46c042ac2b2587003a5ce5e5cf3ab5e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:33:25 +0000 Subject: [PATCH 37/38] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 9bbdb62..69cd296 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 24%{?dist} +Release: 25%{?dist} License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -95,6 +95,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.1.9-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 3.1.9-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5cd1f22cea3cf976b78b1361bf0c43b9513d993f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Jan 2026 18:30:40 +0000 Subject: [PATCH 38/38] Rebuilt for Boost 1.90 --- source-highlight.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source-highlight.spec b/source-highlight.spec index 69cd296..5dc9e39 100644 --- a/source-highlight.spec +++ b/source-highlight.spec @@ -1,7 +1,7 @@ Summary: Produces a document with syntax highlighting Name: source-highlight Version: 3.1.9 -Release: 25%{?dist} +Release: 26%{?dist} License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig @@ -95,6 +95,9 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d %{_includedir}/srchilite/*.h %changelog +* Mon Jan 12 2026 Jonathan Wakely - 3.1.9-26 +- Rebuilt for Boost 1.90 + * Fri Jul 25 2025 Fedora Release Engineering - 3.1.9-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild