Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2019-07-31 10:23:42 +03:00
commit 16e8d80794
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 24 additions and 7 deletions

View File

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

View File

@ -1,11 +1,13 @@
Summary: Produces a document with syntax highlighting
Name: source-highlight
Version: 3.1.8
Release: 23.0.riscv64%{?dist}
Release: 25.0.riscv64%{?dist}
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
Patch0: fix-boost-riscv64-libdir.patch
# Fix for https://savannah.gnu.org/bugs/index.php?55967
Patch: source-highlight-3.1.8-no-black.patch
Patch10: fix-boost-riscv64-libdir.patch
URL: http://www.gnu.org/software/src-highlite/
BuildRequires: bison, flex, boost-devel
BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion)
@ -35,10 +37,7 @@ Requires: boost-devel
Development files for source-highlight
%prep
%setup -q
%ifarch riscv64
%patch0 -p1 -b .orig
%endif
%autosetup -p1
%build
%ifarch riscv64
@ -92,9 +91,15 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
%{_includedir}/srchilite/*.h
%changelog
* Wed Feb 20 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 3.1.8-23.0.riscv64
* Wed Jul 31 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.1.8-25.0.riscv64
- Fix boost LDFLAGS (libdir) for RISC-V (riscv64)
* 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)