9 changed files with 250 additions and 87 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,43 @@
-SOURCES/highlight-3.42.tar.bz2
+highlight-3.1-beta2.tar.bz2
+/highlight-3.1-beta3.tar.bz2
+/highlight-3.1.tar.bz2
+/highlight-3.2.tar.bz2
+/highlight-3.3.tar.bz2
+/highlight-3.4.tar.bz2
+/highlight-3.5.tar.bz2
+/highlight-3.6.tar.bz2
+/highlight-3.7.tar.bz2
+/highlight-3.8.tar.bz2
+/highlight-3.9.tar.bz2
+/highlight-3.11-beta.tar.bz2
+/highlight-3.12.tar.bz2
+/highlight-3.13.tar.bz2
+/highlight-3.15.tar.bz2
+/highlight-3.16.tar.bz2
+/highlight-3.16.1.tar.bz2
+/highlight-3.18.tar.bz2
+/highlight-3.20.tar.bz2
+/highlight-3.21.tar.bz2
+/highlight-3.22.tar.bz2
+/highlight-3.28.tar.bz2
+/highlight-3.30.tar.bz2
+/highlight-3.31.tar.bz2
+/highlight-3.33.tar.bz2
+/highlight-3.36.tar.bz2
+/highlight-3.39.tar.bz2
+/highlight-3.42.tar.bz2
+/highlight-3.44.tar.bz2
+/highlight-3.47.tar.bz2
+/highlight-3.48.tar.bz2
+/highlight-3.50.tar.bz2
+/highlight-3.52.tar.bz2
+/highlight-3.53.tar.bz2
+/highlight-3.54.tar.bz2
+/highlight-3.56.tar.bz2
+/highlight-3.57.tar.bz2
+/highlight-3.60.tar.bz2
+/highlight-4.1.tar.bz2
+/highlight-4.2.tar.bz2
+/highlight-4.5.tar.bz2
+/highlight-4.6.tar.bz2
+/highlight-4.8.tar.bz2
--- a/.highlight.metadata
+++ b/.highlight.metadata
@ -1 +0,0 @@
-c2e55f56d715192ed0245431aaa88e44140d0fcf SOURCES/highlight-3.42.tar.bz2
--- a/SOURCES/highlight-3.42-list-available-langs.patch
+++ b/SOURCES/highlight-3.42-list-available-langs.patch
@ -1,16 +0,0 @@
-diff -up highlight-3.42/src/core/platform_fs.cpp.list-available-langs highlight-3.42/src/core/platform_fs.cpp
--- highlight-3.42/src/core/platform_fs.cpp.list-available-langs	2019-01-11 11:42:30.948013206 +0100
-+++ highlight-3.42/src/core/platform_fs.cpp	2019-01-11 11:44:25.206011626 +0100
-@@ -222,8 +222,10 @@ void getFileNames ( const string &direct
-     if ( errno ) return;
- 
-     // sort the current entries for fileName
-    if ( firstEntry < fileName.size() )
-        sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
-+    // https://gitlab.com/saalen/highlight/issues/84
-+    // coredump with GLIBCXX_ASSERTIONS compiler option, use iterators if sort is needed
-+    //if ( firstEntry < fileName.size() )
-+    //    sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
- 
-     // recurse into sub directories
-     // if not doing recursive, subDirectory is empty
--- a/SPECS/highlight.spec
+++ b/SPECS/highlight.spec
@ -1,92 +1,102 @@
-Name:           highlight
-Summary:        Universal source code to formatted text converter
-Version:        3.42
-Release:        3%{?dist}
-Group:          Development/Tools
-License:        GPLv3
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

-URL:            http://www.andre-simon.de/
-Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
-Patch01:        highlight-3.42-list-available-langs.patch
+* Tue Jun 20 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 4.6-2
+- Disable Qt5 GUI in RHEL 10 builds

-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  lua-devel, boost-devel
-BuildRequires:  desktop-file-utils
+* Fri Jun 09 2023 Filipe Rosset <rosset.filipe@gmail.com> - 4.6-1
+- update to 4.6

-%{?filter_setup:
-%filter_from_provides /^perl(/d;
-%filter_from_requires /^perl(/d;
-%filter_from_requires /^\/bin\/lua/d;
-%filter_setup
-}
+* Fri Mar 31 2023 Filipe Rosset <rosset.filipe@gmail.com> - 4.5-1
+- Update to 4.5

-%description
-A utility that converts sourcecode to HTML, XHTML, RTF, LaTeX, TeX,
-XSL-FO, XML or ANSI escape sequences with syntax highlighting.
-It supports several programming and markup languages.
-Language descriptions are configurable and support regular expressions.
-The utility offers indentation and reformatting capabilities.
-It is easily possible to create new language definitions and colour themes.
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

-%package gui
-Summary:        GUI for the hihghlight source code formatter
-Requires:       %{name} = %{version}-%{release}
+* Tue Sep 6 2022 Amit Shah <amitshah@fedoraproject.org> - 4.2-2
+- Allow disabling Qt deps

-%description gui
-A Qt-based GUI for the highlight source code formatter source.
+* Thu Aug 25 2022 Filipe Rosset <rosset.filipe@gmail.com> - 4.2-1
+- Update to 4.2

-%prep
-%autosetup -p1
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-%build
-CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS
-CXXFLAGS="$CXXFLAGS -fPIC %{optflags}"; export CXXFLAGS
-LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-# Disable paralell builds, atempt to fixes FTBFS
-#%make_build all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"        \
-%make_build all gui           CFLAGS="${CFLAGS}"          \
-                              CXXFLAGS="${CXXFLAGS}"      \
-                              LDFLAGS="${LDFLAGS}"        \
-                              LFLAGS="-Wl,-O1 ${LDFLAGS}" \
-                              QMAKE="%{_qt5_qmake}"       \
-                              QMAKE_STRIP=
+* Mon Oct 04 2021 Filipe Rosset <rosset.filipe@gmail.com> - 4.1-1
+- Update to 4.1

-%install
-%make_install
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.60-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.60-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

-make install-gui DESTDIR=$RPM_BUILD_ROOT
+* Thu Jan  7 2021 Filipe Rosset <rosset.filipe@gmail.com> - 3.60-2
+- Rebuilt for make macro change

-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
+* Wed Dec 30 2020 Filipe Rosset <rosset.filipe@gmail.com> - 3.60-1
+- Update to 3.60

-desktop-file-install \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   highlight.desktop
+* Sat Aug 22 2020 Filipe Rosset <rosset.filipe@gmail.com> - 3.57-1
+- Update to 3.57

-%files
-%{_bindir}/highlight
-%{_datadir}/highlight/
-%{_mandir}/man1/highlight.1*
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.56-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

-%config(noreplace) %{_sysconfdir}/highlight/
+* Mon Apr 27 2020 Filipe Rosset <rosset.filipe@gmail.com> - 3.56-1
+- Update to 3.56

-%doc ChangeLog AUTHORS README* TODO extras/
-%license COPYING
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.54-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

-%files gui
-%{_bindir}/highlight-gui
-%{_datadir}/applications/highlight.desktop
-%{_datadir}/pixmaps/highlight.xpm
+* Mon Jan 20 2020 Filipe Rosset <rosset.filipe@gmail.com> - 3.54-1
+- Update to 3.54

-%changelog
-* Fri Jan 11 2019 Milan Crha <mcrha@redhat.com> - 3.42-3
- Add patch for RH bug #1662420 (Crash when listing available languages)
+* Mon Aug 05 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.53-1
+- Update to 3.53

-* Wed Sep 19 2018 Milan Crha <mcrha@redhat.com> - 3.42-2
- Change how compiler/linker flags are passed to internal qmake invocation
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.52-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Jul 13 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.52-2
+- Disable paralell builds to fix build failures
+- Make it possible to build with different prefix (rpm2flatpak) thanks to Milan Crha
+- Fixed rhbz#1728753 and rhbz#1729455
+
+* Sat Jun 15 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.52-1
+- Updated to new 3.52 upstream version
+
+* Sun Mar 31 2019 Filipe Rosset <rosset.filipe@gmail.com> - 3.50-1
+- Updated to new 3.50 upstream version
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.48-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Dec 18 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.48-1
+- Updated to new 3.48 upstream version, remove upstreamed patch
+
+* Tue Dec 11 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.47-2
+- rebuilt to fix --list-scripts=langs crash fixes rhbz #1656332
+
+* Fri Oct 26 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.47-1
+- Updated to new 3.47 upstream version
+- spec cleanup (remove old unused comments)
+- Fixes rhbz #1611359 and #1630845 thanks to Milan Crha for all bug reports
+
+* Thu Sep 20 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-2
+- attempt to fix and respect build flags rhbz #1563149
+
+* Sat Sep 15 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-1
+- Updated to new 3.44 upstream version
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.42-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Apr 09 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.42-2
+- added gcc-c++ as BR

 * Thu Mar 29 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.42-1
 - Updated to new 3.42 upstream version
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/highlight.spec
+++ b/highlight.spec
@ -0,0 +1,110 @@
+Name:           highlight
+Summary:        Universal source code to formatted text converter
+Version:        4.8
+Release:        %autorelease
+License:        GPL-3.0-only
+URL:            http://www.andre-simon.de/
+Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
+
+%bcond qt %[%{undefined rhel} || 0%{?rhel} < 10]
+
+BuildRequires:  gcc-c++
+%if %{with qt}
+BuildRequires:  qt5-qtbase-devel
+%endif
+BuildRequires:  lua-devel, boost-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  make
+
+%{?filter_setup:
+%filter_from_provides /^perl(/d;
+%filter_from_requires /^perl(/d;
+%filter_from_requires /^\/bin\/lua/d;
+%filter_setup
+}
+
+%description
+A utility that converts sourcecode to HTML, XHTML, RTF, LaTeX, TeX,
+XSL-FO, XML or ANSI escape sequences with syntax highlighting.
+It supports several programming and markup languages.
+Language descriptions are configurable and support regular expressions.
+The utility offers indentation and reformatting capabilities.
+It is easily possible to create new language definitions and colour themes.
+
+%if %{with qt}
+%package gui
+Summary:        GUI for the highlight source code formatter
+Requires:       %{name} = %{version}-%{release}
+
+%description gui
+A Qt-based GUI for the highlight source code formatter source.
+%endif
+
+%prep
+%autosetup
+
+%build
+CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS
+CXXFLAGS="$CXXFLAGS -fPIC %{optflags}"; export CXXFLAGS
+LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS
+
+# disabled paralell builds to fix FTBFS on rawhide & highlight 3.52+
+#make_build all gui           CFLAGS="${CFLAGS}"          \
+ %{__make} all                CFLAGS="${CFLAGS}"          \
+                              CXXFLAGS="${CXXFLAGS}"      \
+                              LDFLAGS="${LDFLAGS}"        \
+                              LFLAGS="-Wl,-O1 ${LDFLAGS}" \
+                              PREFIX="%{_prefix}"         \
+                              conf_dir="%{_sysconfdir}/highlight/"
+
+%if %{with qt}
+ %{__make} gui                CFLAGS="${CFLAGS}"          \
+                              CXXFLAGS="${CXXFLAGS}"      \
+                              LDFLAGS="${LDFLAGS}"        \
+                              LFLAGS="-Wl,-O1 ${LDFLAGS}" \
+                              PREFIX="%{_prefix}"         \
+                              conf_dir="%{_sysconfdir}/highlight/" \
+                              QMAKE="%{_qt5_qmake}"       \
+                              QMAKE_STRIP=
+%endif
+
+%install
+%make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+%if %{with qt}
+make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
+%endif
+
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
+
+desktop-file-install \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+   highlight.desktop
+
+%files
+%{_bindir}/highlight
+%{_datadir}/highlight/
+%{_mandir}/man1/highlight.1*
+%{_mandir}/man5/filetypes.conf.5*
+%{_datadir}/bash-completion/completions/highlight
+%{_datadir}/fish/vendor_completions.d/highlight.fish
+%{_datadir}/zsh/site-functions/_highlight
+%config(noreplace) %{_sysconfdir}/highlight/
+
+%doc ChangeLog* AUTHORS README* extras/
+%license COPYING
+
+ %if %{with qt}
+%files gui
+%{_bindir}/highlight-gui
+%{_datadir}/applications/highlight.desktop
+%{_datadir}/icons/hicolor/256x256/apps/highlight.png
+%else
+%exclude %{_datadir}/applications/highlight.desktop
+%endif
+
+
+%changelog
+%autochangelog
--- a/plans/main.fmf
+++ b/plans/main.fmf
@ -0,0 +1,10 @@
+execute:
+    how: tmt
+
+discover:
+    how: shell
+    tests:
+    - name: run help
+      test: highlight --help
+    - name: run on one suplied file
+      test: highlight /usr/share/highlight/plugins/cpp_qt.lua | grep html
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (highlight-4.8.tar.bz2) = c04e94b2fdb1ebda37937a8bdcdb1bb5afe171a74ca58ddf40b1972bc62a07dc02d628bc962b1db654805a446f32da8d7af41a0c162476cf47a3535128ca6ace
				`@ -1 +0,0 @@`
				`c2e55f56d715192ed0245431aaa88e44140d0fcf SOURCES/highlight-3.42.tar.bz2`
				`@ -0,0 +1 @@`
				`SHA512 (highlight-4.8.tar.bz2) = c04e94b2fdb1ebda37937a8bdcdb1bb5afe171a74ca58ddf40b1972bc62a07dc02d628bc962b1db654805a446f32da8d7af41a0c162476cf47a3535128ca6ace`