plans/ci.fmf

@@ -1,5 +1,6 @@
 summary: CI Gating Plan
 discover:
     how: fmf
+    directory: tests
 execute:
-    how: tmt
+    how: beakerlib

source-highlight-bz2256374-lesspipe_sh.patch

@@ -1,39 +0,0 @@
-commit 8be2bee7f6861fd27d5c181b15d3126fc7dbf73b
-Author: Keith Seitz <keiths@redhat.com>
-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

source-highlight.spec

@@ -1,15 +1,14 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
 Version: 3.1.9
-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
+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
-Patch1: source-highlight-bz2256374-lesspipe_sh.patch
 BuildRequires: make
 BuildRequires: bison, flex, boost-devel
 BuildRequires: help2man, chrpath, pkgconfig(bash-completion)
@@ -60,11 +59,7 @@ 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
 
-# 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"
+echo -e "\ncxx = cpp.lang" >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map
 
 bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
 mkdir -p $RPM_BUILD_ROOT$bashcompdir
@@ -95,43 +90,6 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 %{_includedir}/srchilite/*.h
 
 %changelog
-* Mon Jan 12 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 3.1.9-26
-- Rebuilt for Boost 1.90
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Keith Seitz <keiths@redhat.com> - 3.1.9-21
-- Added upstream patch to fix BZ 2256374.
-
-* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-20
-- Rebuilt for Boost 1.83
-
-* Fri Aug 25 2023 Keith Seitz <keiths@redhat.com>
-- migrated to SPDX license
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-18
-- Rebuilt for Boost 1.81
-
-* Sun Jan 29 2023 FeRD (Frank Dana) <ferdnyc@gmail.com> - 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 <releng@fedoraproject.org> - 3.1.9-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
 * Thu Oct 06 2022 Adrian Reber <adrian@lisas.de> - 3.1.9-15
 - Added upstream patch to fix #2131454
 

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 --undefine specpartsdir $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
+    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"