source-highlight-3.1.8-no-black.patch

@@ -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 ;
- 

source-highlight.spec

@@ -1,45 +1,46 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
 Version: 3.1.8
-Release: 25%{?dist}
+Release: 10%{?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
-# 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)
-BuildRequires: gcc, gcc-c++
+Requires(post): info
+Requires(preun): info
 Requires: ctags
 
 %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}
-# For linking against source-higlight using pkgconfig
-Requires: boost-devel
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 Development files for source-highlight
 
 %prep
-%autosetup -p1
+%setup -q
 
 %build
 %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
@@ -58,7 +59,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
@@ -75,58 +90,13 @@ 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
-* 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
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 23 2018 Jonathan Wakely <jwakely@redhat.com> - 3.1.8-15
-- Rebuilt for Boost 1.66
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 3.1.8-12
-- Rebuilt for s390x binutils bug
-
-* Tue Jul 04 2017 Jonathan Wakely <jwakely@redhat.com> - 3.1.8-11
-- Rebuilt for Boost 1.64
-
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild