- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -4,3 +4,7 @@ source-highlight-3.1.4.tar.gz.sig
 source-highlight-3.1.4.tar.gz
 /source-highlight-3.1.6.tar.gz
 /source-highlight-3.1.6.tar.gz.sig
+/source-highlight-3.1.7.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.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 ;
+ 

source-highlight.spec

@@ -1,21 +1,21 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
-Version: 3.1.6
+Version: 3.1.8
-Release: 6%{?dist}
+Release: 25%{?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
+BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion)
-Requires(post): info
+BuildRequires: gcc, gcc-c++
-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 :
+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.
@@ -23,24 +23,23 @@ escape sequences as output format.
 
 %package devel
 Summary: Development files for source-highlight
-Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+# For linking against source-higlight using pkgconfig
-Requires: pkgconfig
+Requires: boost-devel
 
 %description devel
 Development files for source-highlight
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure --disable-static \
            --with-boost-regex=boost_regex
-make %{?_smp_mflags}
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%make_install
-make install DESTDIR=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs
 %{__sed} -i 's/\r//' docs/source-highlight/*.css
@@ -53,30 +52,22 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight-settings
 
 echo -e "\ncxx = cpp.lang" >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map
 
-%post
+bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
-/sbin/ldconfig
+mkdir -p $RPM_BUILD_ROOT$bashcompdir
-/sbin/install-info %{_infodir}/source-highlight.info \
+mv $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/source-highlight \
-  %{_infodir}/dir 2>/dev/null || :
+    $RPM_BUILD_ROOT$bashcompdir/
-
+rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-%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
 %{_bindir}/source-highlight
+%{_bindir}/source-highlight-esc.sh
 %{_bindir}/check-regexp
 %{_bindir}/source-highlight-settings
 %{_bindir}/src-hilite-lesspipe.sh
-%dir %{_sysconfdir}/bash_completion.d
+%{_datadir}/bash-completion/
-%{_sysconfdir}/bash_completion.d/source-highlight
 %{_libdir}/libsource-highlight.so.*
 %dir %{_datadir}/source-highlight
 %{_datadir}/source-highlight/*
@@ -84,13 +75,115 @@ fi
 %{_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
+
+* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 3.1.8-9
+- Rebuilt for Boost 1.63
+
+* Tue May 17 2016 Jonathan Wakely <jwakely@redhat.com> - 3.1.8-8
+- Rebuilt for linker errors in boost (#1331983)
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jan 14 2016 Jonathan Wakely <jwakely@redhat.com> - 3.1.8-6
+- Rebuilt for Boost 1.60
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.1.8-5
+- Rebuilt for Boost 1.59
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Fri Jul 24 2015 Adrian Reber <adrian@lisas.de> - 3.1.8-3
+- another rebuild for Boost 1.58
+
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 3.1.8-2
+- rebuild for Boost 1.58
+
+* Wed Jul 22 2015 Adrian Reber <adrian@lisas.de> - 3.1.8-1
+- updated to 3.1.8
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.7-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.1.7-8
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Mon Mar 23 2015 Rex Dieter <rdieter@fedoraproject.org> 3.1.7-7
+- rebuild (gcc5)
+
+* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 3.1.7-6
+- Rebuild for boost 1.57.0
+
+* Sat Jan 24 2015 Ville Skyttä <ville.skytta@iki.fi> - 3.1.7-5
+- Install bash completion to %%{_datadir}/bash-completion
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 3.1.7-2
+- Rebuild for boost 1.55.0
+
+* Fri Aug 23 2013 Adrian Reber <adrian@lisas.de> - 3.1.7-1
+- updated to 3.1.7
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -194,7 +287,7 @@ fi
 * Fri Sep 15 2006 Adrian Reber <adrian@lisas.de> - 2.4-1
 - updated to 2.4
 
-* Wed Mar 21 2006 Adrian Reber <adrian@lisas.de> - 2.3-2
+* Tue Mar 21 2006 Adrian Reber <adrian@lisas.de> - 2.3-2
 - using a new url.lang to fix #195720
   (https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=131352)
 
@@ -229,7 +322,7 @@ fi
 - included the documentation
 - optimised the %%descritpion
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Tue Jun 22 2004 Adrian Reber <adrian@lisas.de> - 0:1.9-0.fdr.2

sources

@@ -1,2 +1,2 @@
-44856c15a5dc8694e30d92f640ed348f  source-highlight-3.1.6.tar.gz
+3243470706ef5fefdc3e43b5306a4e41  source-highlight-3.1.8.tar.gz
-6272621c5af418f1a104c4bdae3b31b1  source-highlight-3.1.6.tar.gz.sig
+fec14cd26148f53d05f26b9ecda1fe4c  source-highlight-3.1.8.tar.gz.sig