4 changed files with 39 additions and 101 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
-SOURCES/source-highlight-3.1.9.tar.gz
+SOURCES/source-highlight-3.1.8.tar.gz
+SOURCES/source-highlight-3.1.8.tar.gz.sig
--- a/.source-highlight.metadata
+++ b/.source-highlight.metadata
@ -1 +1,2 @@
-233e37b011ba1a5e57f674dd0077d505306bc3e4 SOURCES/source-highlight-3.1.9.tar.gz
+55b814ec09674ef7f5ab42c46b2ae5a0f86f7c9b SOURCES/source-highlight-3.1.8.tar.gz
+6f37f9f4e354c9ed74a1c53c7267327135a3edef SOURCES/source-highlight-3.1.8.tar.gz.sig
--- a/SOURCES/source-highlight-3.1.9.tar.gz.sig
+++ b/SOURCES/source-highlight-3.1.9.tar.gz.sig
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQJDBAABCAAtFiEE6f6K6VDLB/W+sugFA2p1MJ0z5bUFAl2h6vwPHHRvbUB0cm9t
-ZXkuY29tAAoJEANqdTCdM+W1oWEP/RJEfZTp3WrGB+Fe1+FNiMDq+iGcdbm9MXpr
-fp871ds+zvm7Wb4WJEAMtrNSqozNQ1BLJdYuKovI4tWV/ej+189R7vqf1JytU31H
-8Sx6QokDt/cU+4NA4CBdXZoDEGwcQiFC5mQQCFiZqhJ70ayvnMRQ+XapMxFF+p2c
-pRv7+qgJVCrxRS7Vj21ZozFR7ZcMpm/fvZujWFL04DVh3hh84MDnlidl8xzNLoFW
-f9TJVgKA1ulA8urLzEfF9b8jRgpit1xXao86uwmW/t9wnYsUEZWqUQ9W9BvheufY
-2tjjwoQHBpPg6fyEZGenUcYMXKsbGK4Ce9kJItn6MTvo73OZ1sdjJtTxixMwHQh2
-NeNQ4TejoYJ7cM0YxT/peZcczlF9i2hQOIV7eqsbjhQSRD75POMnwcv98jqEzFE0
-gg9GiNg1RRgP2RtY/U0XCw2RjPEIpk8TalrUA8h0iQgGV837maTJKfpII2C29I+m
-EARjLz3k3tz/zBLtzPrVEJXCPp0V7WpHxyrBmrk46gHw0Dqlxtnpe58a40AeyKsN
-BwM8uH9ghWbizmg0UKXvEssycLGSzkB/G1c3l8nkI7V6dvNymuX5By4GpuakUiPz
-1zRJ9Q2yLOaF8owcRYStc5iLgolaTvTGVlbc6xoU1ZZE+obhINv5AX102uh8hvMk
-cx600fqZ
-=7IK7
-----END PGP SIGNATURE-----
--- a/SPECS/source-highlight.spec
+++ b/SPECS/source-highlight.spec
@ -1,31 +1,31 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
-Version: 3.1.9
-Release: 12%{?dist}
+Version: 3.1.8
+Release: 18%{?dist}
+Group: Development/Tools
 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++
-%if 0%{!?rhel:1} || 0%{?rhel} < 9
-BuildRequires: ctags
+BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion)
+Requires(post): info
+Requires(preun): info
 Requires: ctags
-%endif

 %description
 This program, given a source file, produces a document with syntax
-highlighting. At the moment this package can handle:
-Java, Javascript, C/C++, Prolog, Perl, Php3, Python, Flex, ChangeLog, Ruby,
-Lua, Caml, Sml and Log as source languages, and HTML, XHTML and ANSI color
+highlighting. At the moment this package can handle :
+Java, Javascript, C/C++, Prolog, Perl, Php3, Python, Flex, ChangeLog, Ruby, 
+Lua, Caml, Sml and Log as source languages, and HTML, XHTML and ANSI color 
 escape sequences as output format.


 %package devel
 Summary: Development files for source-highlight
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 # For linking against source-higlight using pkgconfig
 Requires: boost-devel

@ -33,19 +33,16 @@ Requires: boost-devel
 Development files for source-highlight

 %prep
-%autosetup -p1
+%setup -q

 %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
+make %{?_smp_mflags}

 %install
-%make_install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT

 mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs
 %{__sed} -i 's/\r//' docs/source-highlight/*.css
@ -64,7 +61,21 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/source-highlight \
    $RPM_BUILD_ROOT$bashcompdir/
 rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d

+%post
+/sbin/ldconfig
+/sbin/install-info %{_infodir}/source-highlight.info \
+  %{_infodir}/dir 2>/dev/null || :
+
+%preun
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete %{_infodir}/source-highlight.info \
+    %{_infodir}/dir 2>/dev/null || :
+fi
+
+%postun -p /sbin/ldconfig
+
 %files
+%defattr (-,root,root)
 %doc docs/source-highlight/*
 %{_bindir}/cpp2html
 %{_bindir}/java2html
@ -81,76 +92,18 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 %{_infodir}/source-highlight*.info*

 %files devel
+%defattr (-,root,root)
 %dir %{_includedir}/srchilite
 %{_libdir}/libsource-highlight.so
 %{_libdir}/pkgconfig/source-highlight.pc
 %{_includedir}/srchilite/*.h

 %changelog
-* Tue Jul 16 2024 Keith Seitz <keiths@redhat.com> 3.1.9-12
- Rebuild for shipping devel subpackage in CRB
+* Mon May 27 2024 Tomas Popela <tpopela@redhat.com> - 3.1.8-18
+- Rebuild for shipping devel subpackage in CRB (RHEL-38616)

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.9-11
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.9-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-9
- Rebuilt for removed libstdc++ symbol (#1937698)
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-7
- Rebuilt for Boost 1.75
-
-* Wed Jan  6 2021 Keith Seitz <keiths@redhat.com> - 3.1.9-6
- Disable ctags support for RHEL9+.
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Jeff Law <law@redhat.com> - 3.1.9-4
- Force C++14 as this code is not C++17 ready
-
-* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-3
- Rebuilt for Boost 1.73
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Oct 12 2019 Orion Poplawski <orion@nwra.com> - 3.1.9-1
- Update to 3.1.9
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Mar 20 2019 fedora-toolbox <otaylor@redhat.com> - 3.1.8-24
- Patch esc.style to avoid using the black color (#1688372)
-
-* Mon Feb 18 2019 Adrian Reber <adrian@lisas.de> - 3.1.8-23
- Require boost-devel in the source-highlight-devel package (#1638029)
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 3.1.8-21
- Rebuilt for Boost 1.69
-
-* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 3.1.8-20
- Rebuild with fixed binutils
-
-* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.1.8-19
- Replace obsolete scriptlets
-
-* Mon Jul 16 2018 Adrian Reber <adrian@lisas.de> - 3.1.8-18
- Added BR gcc, gcc-c++
- Small SPEC file cleanups
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Mon Nov 02 2020 Felipe Borges <feborges@redhat.com> - 3.1.8-17
+- Add boost-devel dependecy to devel package (#1718480)

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild