dist-git conversion

#2781)

.gitignore

@@ -1,10 +1,2 @@
-source-highlight-3.1.3.tar.gz
+source-highlight-2.9.tar.gz
-source-highlight-3.1.3.tar.gz.sig
+source-highlight-2.9.tar.gz.sig
-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

@@ -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,270 +1,68 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
-Version: 3.1.8
+Version: 2.9
-Release: 25%{?dist}
+Release: 1%{?dist}
+Group: Development/Tools
 License: GPLv3+
-Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.9.tar.gz
-Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig
+Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.9.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/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison, flex, boost-devel
-BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion)
+BuildRequires: help2man, ctags
-BuildRequires: gcc, gcc-c++
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-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,
+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
+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
-
-%description devel
-Development files for source-highlight
-
 %prep
-%autosetup -p1
+%setup -q
 
 %build
-%configure --disable-static \
+%configure
-           --with-boost-regex=boost_regex
+make %{?_smp_mflags}
-%make_build
 
 %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
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-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
 
-echo -e "\ncxx = cpp.lang" >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
+%post
-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
 
 %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
-%{_datadir}/bash-completion/
+%{_datadir}/%{name}
-%{_libdir}/libsource-highlight.so.*
-%dir %{_datadir}/source-highlight
-%{_datadir}/source-highlight/*
 %{_mandir}/man1/*
-%{_infodir}/source-highlight*.info*
+%{_infodir}/source-highlight.info*
-
-%files devel
-%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
-
-* Sat Jul 27 2013 pmachata@redhat.com - 3.1.6-5
-- Rebuild for boost 1.54.0
-
-* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 3.1.6-4
-- Rebuild for Boost-1.53.0
-
-* Wed Aug  8 2012 Bill Nottingham <notting@redhat.com> - 3.1.6-3
-- rebuild against new boost
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Mar 25 2012 Adrian Reber <adrian@lisas.de> - 3.1.6-1
-- updated to 3.1.6
-- removed buildroot and clean section
-- fixed "missing c++ source language detection for .cxx extension" (#728311)
-- fixed "source-highlight : Conflicts with autoconf-archive" (#797794)
-
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-10
-- Rebuilt for c++ ABI breakage
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sun Nov 20 2011  <dodji@redhat.com> - 3.1.4-8
-- Rebuild against boost 1.48
-
-* Thu Jul 21 2011 Adrian Reber <adrian@lisas.de> - 3.1.4-7
-- and again a rebuilt for boost.
-
-* Fri Apr 01 2011 Christoph Wickert <cwickert@fedoraproject.org> - 3.1.4-6
-- Another rebuild, libboost SONAME has changed again
-
-* Wed Mar 16 2011 Christoph Wickert <cwickert@fedoraproject.org> - 3.1.4-5
-- Rebuild for correct libboost SONAME
-
-* Sun Mar 13 2011 Christoph Wickert <cwickert@fedoraproject.org> - 3.1.4-4
-- Rebuild for boost 1.46.1
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Feb 06 2011 Bastien Nocera <bnocera@redhat.com> 3.1.4-2
-- Rebuild against newer boost
-
-* Mon Aug 16 2010 Leigh Scott <leigh123linux@googlemail.com> - 3.1.4-1
-- updated to 3.1.4
-
-* Thu Aug  5 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 3.1.3-3
-- rebuild for new boost (again)
-
-* Tue Jul 27 2010 Christoph Wickert <cwickert@fedoraproject.org> - 3.1.3-2
-- Rebuild for new boost
-- Fix Requires for %%post and %%preun
-
-* Fri Jun 04 2010 Leigh Scott <leigh123linux@googlemail.com> - 3.1.3-1
-- updated to 3.1.3
-- change configure command so it finds boost_regex
-- fix source url's
-- add devel package
-- fix directory ownership
-- fix rpath on binary
-
-* Fri Jan 22 2010 Adrian Reber <adrian@lisas.de> - 2.10-5
-- rebuilt for new boost.
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Dec 17 2008 Benjamin Kosnik  <bkoz@redhat.com> - 2.10-2
-- Rebuild for boost-1.37.0.
-
-* Sat Aug 16 2008 Adrian Reber <adrian@lisas.de> - 2.10-1
-- updated to 2.10
-
 * Fri Jun 13 2008 Adrian Reber <adrian@lisas.de> - 2.9-1
 - updated to 2.9
 - removed upstreamed gcc43 patch
@@ -287,7 +85,7 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 * Fri Sep 15 2006 Adrian Reber <adrian@lisas.de> - 2.4-1
 - updated to 2.4
 
-* Tue Mar 21 2006 Adrian Reber <adrian@lisas.de> - 2.3-2
+* Wed 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)
 
@@ -322,7 +120,7 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 - included the documentation
 - optimised the %%descritpion
 
-* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri 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 @@
-3243470706ef5fefdc3e43b5306a4e41  source-highlight-3.1.8.tar.gz
+80a947681d32b0fe515a5cd01f9582a7  source-highlight-2.9.tar.gz
-fec14cd26148f53d05f26b9ecda1fe4c  source-highlight-3.1.8.tar.gz.sig
+597f43655ab83464b856e98aacb42b22  source-highlight-2.9.tar.gz.sig