Compare commits

...
Sign in to create a new pull request.

54 commits

Author SHA1 Message Date
Jonathan Wakely
5cd1f22cea Rebuilt for Boost 1.90 2026-01-12 18:30:40 +00:00
Fedora Release Engineering
504f777d46 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 18:33:25 +00:00
Fedora Release Engineering
7b852ade4c Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 11:15:52 +00:00
Fedora Release Engineering
0895a52eb5 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 06:06:00 +00:00
Fedora Release Engineering
f9e5d87e99 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 03:57:57 +00:00
Michal Kolar
4371800781 tests/source-highlight-testsuite: adapt to rpm package > 4.18.91 2024-01-24 11:34:27 +00:00
Keith Seitz
72ffdf0491 Backport upstream fix for "lesspipe may contain ".sh" extension"
Also use commit date for "Oct 15 2022 - 3.1.9-17" commit to quash
rpmlint error.

Resolves: BZ 2256374
2024-01-22 10:10:16 -08:00
Jonathan Wakely
68c1ec65db Fix CI gating plan
Remove obsolete options.
2024-01-19 00:23:29 +00:00
Jonathan Wakely
5afd974ee7 Rebuilt for Boost 1.83 2024-01-17 22:58:47 +00:00
Keith Seitz
fdf2136ab9 Migrate to SPDX license
Licenses used by the files in this package:
GFDL-1.1-or-later
LicenseRef-Fedora-Public-Domain (see fedora-license-data commit
   0b3b008da8701c3ca528eb41f9998097b4dbe3d2)
GPL-2.0-only (some test files shipped with binary RPM)
GPL-3.0-or-later
GPL-3.0-or-later WITH Bison-exception-2.2 (srchilite/*parser.{h,cc})
2023-08-25 12:20:54 -07:00
Fedora Release Engineering
8575fe6860 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 02:10:17 +00:00
Jonathan Wakely
dfd3117c8d Rebuilt for Boost 1.81 2023-02-20 22:07:11 +00:00
FeRD (Frank Dana)
75c399a21e Add 'rpm-spec' language mapping
Also drop addition of 'cxx' mapping, fixed upstream.
2023-01-29 20:45:04 -05:00
Fedora Release Engineering
4ea2a1abba Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 03:43:24 +00:00
Adrian Reber
cdc578d87f
Added upstream patch to fix #2131454
Signed-off-by: Adrian Reber <adrian@lisas.de>
2022-10-06 14:55:31 +02:00
Fedora Release Engineering
a7cb5c448d Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 09:04:58 +00:00
Thomas Rodgers
a9a13dde08 Rebuilt for Boost 1.78 2022-05-04 11:42:00 +02:00
Fedora Release Engineering
3e7ca679ec - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 01:20:30 +00:00
Stephen Gallagher
14cc3a1e1f
Rebuild for Boost 1.76 in ELN
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2021-08-11 15:06:50 -04:00
Jonathan Wakely
abc8f55531 Rebuilt for Boost 1.76 2021-08-07 00:03:56 +01:00
Fedora Release Engineering
7c1ff35fb2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 17:58:32 +00:00
Adrian Reber
f31ecc60f8 Merge #4 drop unwanted scratch build rule for gating 2021-05-23 17:40:28 +00:00
Michal Kolar
68cf369c87 drop unwanted scratch build rule for gating 2021-05-23 13:52:48 +00:00
Adrian Reber
d9d3ca9f7b Merge #3 init FMF CI gating 2021-04-21 16:10:11 +00:00
Jonathan Wakely
b015c2d9e7 Rebuilt for removed libstdc++ symbol (#1937698) 2021-03-30 19:36:51 +01:00
Michal Kolar
d14afcb392 init FMF CI gating 2021-03-24 21:48:39 +00:00
Fedora Release Engineering
828d184134 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 20:46:12 +00:00
Troy Dawson
6163593750 undo mini-bump 2021-01-25 11:33:35 -08:00
Troy Dawson
f1da17b567 mini-bump for eln build 2021-01-25 11:27:17 -08:00
Jonathan Wakely
2777cf6725 Rebuilt for Boost 1.75 2021-01-22 20:53:49 +00:00
Tom Stellard
17e2875d2e Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-08 21:45:22 +00:00
Keith Seitz
21dbadd997 Disable ctags support for RHEL9+ 2021-01-08 18:07:31 +01:00
Fedora Release Engineering
43a1e8ca48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 11:10:02 +00:00
Jeff Law
e28e70ae57 Force C++14 as this code is not C++17 ready 2020-07-28 21:15:56 -06:00
Jonathan Wakely
8492ea50a9 Rebuilt for Boost 1.73 2020-05-28 18:36:46 +01:00
Fedora Release Engineering
b7428b9d21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 23:55:42 +00:00
Orion Poplawski
de02c7eaa4 Remove old patch 2019-10-12 09:54:21 -06:00
Orion Poplawski
9e6b0cc8a0 Update to 3.1.9 2019-10-12 09:47:40 -06:00
Fedora Release Engineering
7f14e26a74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 23:46:05 +00:00
Owen W. Taylor
37eb51f356 Patch esc.style to avoid using the black color (#1688372) 2019-03-20 17:03:11 +00:00
Adrian Reber
285aba1a43
Require boost-devel in the source-highlight-devel package (#1638029) 2019-02-18 17:43:26 +01:00
Fedora Release Engineering
eed4f91284 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 08:11:51 +00:00
Jonathan Wakely
5fcbf9fd31 Rebuilt for Boost 1.69 2019-01-25 07:01:53 +00:00
Florian Weimer
0dbff08586 Rebuild with fixed binutils 2018-07-31 13:07:40 +02:00
Igor Gnatenko
0c9a8b5c04
Replace obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-28 10:26:07 +02:00
Adrian Reber
5bf3df6d67
Added BR gcc, gcc-c++
Small SPEC file cleanups

Signed-off-by: Adrian Reber <adrian@lisas.de>
2018-07-16 15:08:48 +02:00
Fedora Release Engineering
da33a6fd2e - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 06:26:59 +00:00
Jason Tibbitts
5d37ea2a78 Remove needless use of %defattr 2018-07-10 01:24:47 -05:00
Fedora Release Engineering
98f90e93d2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 17:14:43 +00:00
Jonathan Wakely
6e6a217fa8 Rebuilt for Boost 1.66 2018-01-23 11:39:27 +00:00
Fedora Release Engineering
c7ed404050 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 08:40:56 +00:00
Fedora Release Engineering
ae7250dcc9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 18:58:10 +00:00
Jonathan Wakely
75a70e3fcf Rebuilt for s390x binutils bug 2017-07-19 18:52:36 +01:00
Jonathan Wakely
c1d72fcc0b Rebuilt for Boost 1.64 2017-07-04 08:27:58 +01:00
12 changed files with 436 additions and 35 deletions

1
.fmf/version Normal file
View file

@ -0,0 +1 @@
1

2
.gitignore vendored
View file

@ -8,3 +8,5 @@ source-highlight-3.1.4.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.9.tar.gz
/source-highlight-3.1.9.tar.gz.sig

View file

@ -0,0 +1,42 @@
From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Wed, 10 Jun 2020 20:38:27 -0600
Subject: Remove "throw" specifications
C++ throw specifications were deprecated in C++11.
This patch removes them from the library.
---
ChangeLog | 5 +++++
lib/srchilite/fileutil.cc | 2 +-
lib/srchilite/fileutil.h | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
index 59a6d64..963178c 100644
--- a/lib/srchilite/fileutil.cc
+++ b/lib/srchilite/fileutil.cc
@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
// FIXME avoid using a global variable
std::string start_path;
-string readFile(const string &fileName) throw (IOException) {
+string readFile(const string &fileName) {
ifstream file(fileName.c_str());
if (!file.is_open()) {
diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
index 7335a9b..042eb56 100644
--- a/lib/srchilite/fileutil.h
+++ b/lib/srchilite/fileutil.h
@@ -27,7 +27,7 @@ extern std::string start_path;
* @return the contents of the file
* @throw IOException
*/
-string readFile(const string &fileName) throw (IOException);
+string readFile(const string &fileName);
//char *read_file(const string &fileName);
--
cgit v1.1

19
gating.yaml Normal file
View file

@ -0,0 +1,19 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

5
plans/ci.fmf Normal file
View file

@ -0,0 +1,5 @@
summary: CI Gating Plan
discover:
how: fmf
execute:
how: tmt

View file

@ -0,0 +1,39 @@
commit 8be2bee7f6861fd27d5c181b15d3126fc7dbf73b
Author: Keith Seitz <keiths@redhat.com>
Date: Sat Jan 20 09:25:05 2024 -0700
lesspipe may contain ".sh" extension
On Fedora, the "lesspipe" script is actually called
"lesspipe.sh". This patch proposes to use "$(which NAME)"
to figure out the actual name of the script to use.
If neither "lesspipe" nor "lesspipe.sh" exists in $PATH,
the patch simply uses "lesspipe", preserving the current behavior.
It was based on the 3.1.9 release tarball, but should
apply cleanly to current git.
This was reported as Fedora bugzilla 2256374.
diff --git a/src/src-hilite-lesspipe.sh.in b/src/src-hilite-lesspipe.sh.in
index eb5c3ee..76231c7 100644
--- a/src/src-hilite-lesspipe.sh.in
+++ b/src/src-hilite-lesspipe.sh.in
@@ -7,7 +7,15 @@ for source in "$@"; do
*Makefile|*makefile)
source-highlight --failsafe -f esc --lang-def=makefile.lang --style-file=esc.style -i "$source" ;;
*.tar|*.tgz|*.gz|*.bz2|*.xz)
- lesspipe "$source" ;;
+ # The "lesspipe" script may or may not have ".sh" extension.
+ lesspipe=$(which lesspipe 2>/dev/null)
+ if [ -z "$lesspipe" ]; then
+ lesspipe=$(which lesspipe.sh 2>/dev/null)
+ if [ -z "$lesspipe" ]; then
+ lesspipe="lesspipe"
+ fi
+ fi
+ $lesspipe "$source" ;;
*) source-highlight --failsafe --infer-lang -f esc --style-file=esc.style -i "$source" ;;
esac
done

View file

@ -1,46 +1,55 @@
Summary: Produces a document with syntax highlighting
Name: source-highlight
Version: 3.1.8
Release: 10%{?dist}
Group: Development/Tools
License: GPLv3+
Version: 3.1.9
Release: 26%{?dist}
License: GPL-3.0-or-later AND GFDL-1.1-or-later AND LicenseRef-Fedora-Public-Domain AND GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2
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/
# Taken from https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4
# and slightly adapted
Patch0: 904949c9026cb772dc93fbe0947a252ef47127f4.patch
Patch1: source-highlight-bz2256374-lesspipe_sh.patch
BuildRequires: make
BuildRequires: bison, flex, boost-devel
BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion)
Requires(post): info
Requires(preun): info
BuildRequires: help2man, chrpath, pkgconfig(bash-completion)
BuildRequires: gcc, gcc-c++
%if 0%{!?rhel:1} || 0%{?rhel} < 9
BuildRequires: ctags
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
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: %{name}%{?_isa} = %{version}-%{release}
# For linking against source-higlight using pkgconfig
Requires: boost-devel
%description devel
Development files for source-highlight
%prep
%setup -q
%autosetup -p1
%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 %{?_smp_mflags}
%make_build
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%make_install
mv $RPM_BUILD_ROOT%{_datadir}/doc/ docs
%{__sed} -i 's/\r//' docs/source-highlight/*.css
@ -51,7 +60,11 @@ 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
# Submitted and accepted upstream:
# https://savannah.gnu.org/bugs/index.php?63225
# This can be removed upon next release after 3.1.9
echo -e >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map \
"\nrpm-spec = spec.lang\n"
bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
mkdir -p $RPM_BUILD_ROOT$bashcompdir
@ -59,21 +72,7 @@ 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
@ -90,13 +89,143 @@ 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
* Mon Jan 12 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 3.1.9-26
- Rebuilt for Boost 1.90
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Keith Seitz <keiths@redhat.com> - 3.1.9-21
- Added upstream patch to fix BZ 2256374.
* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-20
- Rebuilt for Boost 1.83
* Fri Aug 25 2023 Keith Seitz <keiths@redhat.com>
- migrated to SPDX license
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-18
- Rebuilt for Boost 1.81
* Sun Jan 29 2023 FeRD (Frank Dana) <ferdnyc@gmail.com> - 3.1.9-17
- Stop adding 'cxx' language mapping (fixed upstream)
- Add 'rpm-spec' (used in asciidoc) mapping
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Oct 06 2022 Adrian Reber <adrian@lisas.de> - 3.1.9-15
- Added upstream patch to fix #2131454
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-14.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 3.1.9-13.1
- Rebuilt for Boost 1.78
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-12.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Aug 11 2021 Stephen Gallagher <sgallagh@redhat.com> - 3.1.9-11.1
- Rebuild for Boost 1.76 in ELN
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-11
- Rebuilt for Boost 1.76
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* 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
* 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

View file

@ -1,2 +1,2 @@
3243470706ef5fefdc3e43b5306a4e41 source-highlight-3.1.8.tar.gz
fec14cd26148f53d05f26b9ecda1fe4c source-highlight-3.1.8.tar.gz.sig
SHA512 (source-highlight-3.1.9.tar.gz) = d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
SHA512 (source-highlight-3.1.9.tar.gz.sig) = a0bbee3dda6e97fb82c5a455a161030d3b5d053606b0b455de504714a2e2b088af920b86ef340546bdeef79156bedc5e9e4b8911f2c066e0e172eb7dc805b9a6

View file

@ -0,0 +1,63 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of /tools/source-highlight/Sanity/source-highlight-testsuite
# Description: source-highlight testing by upstream testsuite
# Author: Michal Kolar <mkolar@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2021 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export TEST=/tools/source-highlight/Sanity/source-highlight-testsuite
export TESTVERSION=1.0
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE
.PHONY: all install download clean
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
test -x runtest.sh || chmod a+x runtest.sh
clean:
rm -f *~ $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
$(METADATA): Makefile
@echo "Owner: Michal Kolar <mkolar@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: source-highlight testing by upstream testsuite" >> $(METADATA)
@echo "Type: Sanity" >> $(METADATA)
@echo "TestTime: 30m" >> $(METADATA)
@echo "RunFor: source-highlight" >> $(METADATA)
@echo "Requires: source-highlight rpm-build yum-utils gcc-c++" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2+" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA)
rhts-lint $(METADATA)

View file

@ -0,0 +1,3 @@
PURPOSE of /tools/source-highlight/Sanity/source-highlight-testsuite
Description: source-highlight testing by upstream testsuite
Author: Michal Kolar <mkolar@redhat.com>

View file

@ -0,0 +1,16 @@
summary: source-highlight testing by upstream testsuite
description: ''
contact:
- Michal Kolar <mkolar@redhat.com>
component:
- source-highlight
test: ./runtest.sh
framework: beakerlib
recommend:
- source-highlight
- rpm-build
- yum-utils
- gcc-c++
duration: 30m
extra-summary: /tools/source-highlight/Sanity/source-highlight-testsuite
extra-task: /tools/source-highlight/Sanity/source-highlight-testsuite

View file

@ -0,0 +1,82 @@
#!/bin/bash
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /tools/source-highlight/Sanity/source-highlight-testsuite
# Description: source-highlight testing by upstream testsuite
# Author: Michal Kolar <mkolar@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2021 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include Beaker environment
. /usr/share/beakerlib/beakerlib.sh || exit 1
BUILD_USER=${BUILD_USER:-srchghlghtbld}
TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-100}
PACKAGE="source-highlight"
REQUIRES="$PACKAGE rpm-build gcc-c++"
if rlIsFedora; then
REQUIRES="$REQUIRES dnf-utils"
else
REQUIRES="$REQUIRES yum-utils"
fi
rlJournalStart
rlPhaseStartSetup
rlShowRunningKernel
rlAssertRpm --all
rlRun "TmpDir=\$(mktemp -d)"
rlRun "pushd $TmpDir"
rlFetchSrcForInstalled $PACKAGE
rlRun "useradd -M -N $BUILD_USER" 0,9
[ "$?" == "0" ] && rlRun "del=yes"
rlRun "chown -R $BUILD_USER:users $TmpDir"
rlPhaseEnd
rlPhaseStartSetup "build source-highlight"
rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm"
rlRun "yum-builddep -y $TmpDir/SPECS/*.spec"
rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp --undefine specpartsdir $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
rlRun "rlFileSubmit $TmpDir/rpmbuild.log"
rlRun "cd $TmpDir/BUILD/source-highlight-*"
rlRun "su -c './configure --build=`arch`-redhat-linux-gnu &>$TmpDir/configure.log' $BUILD_USER"
rlRun "rlFileSubmit $TmpDir/configure.log"
rlRun "cd tests"
rlPhaseEnd
rlPhaseStartTest "run testsuite"
rlRun "su -c 'make -k PROGEXE=`which source-highlight` check &>$TmpDir/testsuite.log' $BUILD_USER"
rlRun "rlFileSubmit $TmpDir/testsuite.log"
rlPhaseEnd
rlPhaseStartTest "evaluate results"
rlRun "cd $TmpDir"
rlRun "grep -E 'Makefile.+Error' testsuite.log" 1
rlRun "tests_count=\$(grep -E '^`which source-highlight`' testsuite.log | wc -l)"
[ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN"
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $TmpDir"
[ "$del" == "yes" ] && rlRun "userdel $BUILD_USER"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd