From e1a181b004ad466de91c21107d360bc2c34ab55a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 14:26:37 -0500 Subject: [PATCH 01/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index fbf2384..6f2ea0f 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -36,6 +36,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache %{_bindir}/color-ccache %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 1.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 1.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 7dac90b5fd06b1748e69d8f271aef4ee9019a21a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 12:47:43 -0600 Subject: [PATCH 02/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 6f2ea0f..a01ea7e 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -36,6 +36,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache %{_bindir}/color-ccache %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 1.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 1.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From d425801a192f92dbe80a5d83e7b8a36dd82178ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 15:21:51 +0200 Subject: [PATCH 03/56] Perl 5.18 rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index a01ea7e..337cf69 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -36,6 +36,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache %{_bindir}/color-ccache %changelog +* Wed Jul 17 2013 Petr Pisar - 1.3.2-6 +- Perl 5.18 rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 1.3.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 3329e313d1b5ed7ac3197f28562e6e04f4ca475c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:30:54 -0500 Subject: [PATCH 04/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 337cf69..bcb8b39 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -36,6 +36,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache %{_bindir}/color-ccache %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar - 1.3.2-6 - Perl 5.18 rebuild From 4a61beeae83010e6a395acca2a31a59e9f35a5d5 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 3 Jan 2014 10:33:41 +0100 Subject: [PATCH 05/56] added README and sample config file --- README | 37 ++++++++++++++++++++++++++++++++++ colorgcc.spec | 10 +++++++++- colorgccrc.txt | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 README create mode 100644 colorgccrc.txt diff --git a/README b/README new file mode 100644 index 0000000..1591388 --- /dev/null +++ b/README @@ -0,0 +1,37 @@ +The colorgcc is a perl script written by Jamie Moyers to colorize the terminal +output of C++, CC, CCACHE, G++, GCC so error messages can be found within +longer compiler outputs. + +Homepage: + + http://schlueters.de/colorgcc.html + +Usage: + +Call the compiler name with the 'color-' prefix, eg: + color-gcc + color-g++ + color-cc + color-c++ + +That's it. Alternatively you may want to create following handy +aliases: + + alias gcc='color-gcc' + alias g++='color-g++' + alias cc='color-cc' + alias c++='color-c++' + +The default settings can be overridden with ~/.colorgccrc. +See the comments in the sample .colorgccrc for more information. + +Note: + +colorgcc will only emit color codes if: + + (1) Its STDOUT is a tty and + (2) the value of $TERM is not listed in the "nocolor" option. + +If colorgcc colorizes the output, the compiler's STDERR will be +combined with STDOUT. Otherwise, colorgcc just passes the output from +the compiler through without modification. diff --git a/colorgcc.spec b/colorgcc.spec index bcb8b39..09adc95 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,11 +1,13 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html Source0: http://schlueters.de/colorgcc.%{version}.txt +Source1: http://schlueters.de/colorgccrc.txt +Source2: README BuildArch: noarch Patch0: colorgcc-1.3.2-invocation.patch Requires: perl @@ -17,6 +19,8 @@ CCACHE, G++, GCC so error messages can be found within longer compiler outputs. %prep %setup -q -c -T cp -p %{SOURCE0} . +cp -p %{SOURCE1} . +cp -p %{SOURCE2} . %patch0 -p1 %install @@ -34,8 +38,12 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache %{_bindir}/color-cc %{_bindir}/color-c++ %{_bindir}/color-ccache +%doc README colorgccrc.txt %changelog +* Thu Jan 02 2014 Martin Cermak 1.3.2-8 +- Added README and sample config file. + * Sat Aug 03 2013 Fedora Release Engineering - 1.3.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/colorgccrc.txt b/colorgccrc.txt new file mode 100644 index 0000000..5ec5949 --- /dev/null +++ b/colorgccrc.txt @@ -0,0 +1,54 @@ +# +# colorgcc configuration file +# +# $Id: colorgccrc,v 1.1.1.1 1999/04/25 15:24:03 jamoyers Exp $ +# +# This file should be named $HOME/.colorgccrc +# +# +# The following groups of attributes may be combined for a given color: +# +# clear black on_black +# reset red on_red +# bold green on_green +# underline yellow on_yellow +# underscore blue on_blue +# blink magenta on_magenta +# reverse cyan on_cyan +# concealed white on_white +# +# For example, srcColor: bold cyan on_yellow +# + +# Define the paths to the actual location of the various compilers. +# (Currently, colorgcc only understands these: g++ gcc c++ cc) +g++: /usr/bin/g++ +gcc: /usr/bin/gcc +c++: /usr/bin/c++ +cc: /usr/bin/cc + +# Don't do color if our terminal type ($TERM) is one of these. +# (List all terminal types on one line, seperated by whitespace.) +nocolor: dumb + +# Text between ` and ' is usually source code. +srcColor: bold cyan + +# Text other than a warning or error. +introColor: reset + +# Warnings and errors both have similar formats: +# filename:999:Message +# Each field may be assigned a different color. + +# Warnings +warningFileNameColor: reset +warningNumberColor: white +warningMessageColor: yellow + +# Errors +errorFileNameColor: reset +errorNumberColor: white +errorMessageColor: bold red + + From 9ac06cb9f8ffc838d060e3a02a5a32ece24b4597 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 3 Jan 2014 13:58:40 +0100 Subject: [PATCH 06/56] Renamed and updated config sample --- colorgcc.spec | 13 +++++++++---- sampleconfig.patch | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 sampleconfig.patch diff --git a/colorgcc.spec b/colorgcc.spec index 09adc95..7205a93 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -10,6 +10,7 @@ Source1: http://schlueters.de/colorgccrc.txt Source2: README BuildArch: noarch Patch0: colorgcc-1.3.2-invocation.patch +Patch1: sampleconfig.patch Requires: perl %description @@ -19,9 +20,10 @@ CCACHE, G++, GCC so error messages can be found within longer compiler outputs. %prep %setup -q -c -T cp -p %{SOURCE0} . -cp -p %{SOURCE1} . +cp -p %{SOURCE1} ./colorgccrc.sample cp -p %{SOURCE2} . %patch0 -p1 +%patch1 -p1 %install mkdir -p $RPM_BUILD_ROOT/%{_bindir} @@ -38,11 +40,14 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache %{_bindir}/color-cc %{_bindir}/color-c++ %{_bindir}/color-ccache -%doc README colorgccrc.txt +%doc README colorgccrc.sample %changelog +* Thu Jan 03 2014 Martin Cermak 1.3.2-9 +- Renamed and updated config sample + * Thu Jan 02 2014 Martin Cermak 1.3.2-8 -- Added README and sample config file. +- Added README and sample config file * Sat Aug 03 2013 Fedora Release Engineering - 1.3.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sampleconfig.patch b/sampleconfig.patch new file mode 100644 index 0000000..7263051 --- /dev/null +++ b/sampleconfig.patch @@ -0,0 +1,24 @@ +diff --git a/colorgccrc.sample b/colorgccrc.sample +index 5ec5949..8e87f98 100644 +--- a/colorgccrc.sample ++++ b/colorgccrc.sample +@@ -20,12 +20,14 @@ + # For example, srcColor: bold cyan on_yellow + # + +-# Define the paths to the actual location of the various compilers. ++# Define the paths to the actual location of the various compilers. By default ++# colorgcc calls basenames (e.g. 'gcc') so that $PATH setting is important. + # (Currently, colorgcc only understands these: g++ gcc c++ cc) +-g++: /usr/bin/g++ +-gcc: /usr/bin/gcc +-c++: /usr/bin/c++ +-cc: /usr/bin/cc ++# ++# g++: /usr/bin/g++ ++# gcc: /usr/bin/gcc ++# c++: /usr/bin/c++ ++# cc: /usr/bin/cc + + # Don't do color if our terminal type ($TERM) is one of these. + # (List all terminal types on one line, seperated by whitespace.) From 7d585a31d70dce506339caa032e7d2a647e8400c Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 3 Jan 2014 14:10:23 +0100 Subject: [PATCH 07/56] Minor README updates --- README | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README b/README index 1591388..50c7ff8 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -The colorgcc is a perl script written by Jamie Moyers to colorize the terminal -output of C++, CC, CCACHE, G++, GCC so error messages can be found within -longer compiler outputs. +The colorgcc is a perl script written by Jamie Moyers to colorize the +terminal output of C++, CC, CCACHE, G++, GCC so error messages can be +found within longer compiler outputs. Homepage: @@ -9,21 +9,21 @@ Homepage: Usage: Call the compiler name with the 'color-' prefix, eg: + color-gcc color-g++ color-cc color-c++ -That's it. Alternatively you may want to create following handy -aliases: +That's it. Alternatively you may want to create following handy aliases: alias gcc='color-gcc' alias g++='color-g++' alias cc='color-cc' alias c++='color-c++' -The default settings can be overridden with ~/.colorgccrc. -See the comments in the sample .colorgccrc for more information. +The default settings can be overridden with ~/.colorgccrc. See the +comments in the packaged sample config file for more information. Note: @@ -32,6 +32,6 @@ colorgcc will only emit color codes if: (1) Its STDOUT is a tty and (2) the value of $TERM is not listed in the "nocolor" option. -If colorgcc colorizes the output, the compiler's STDERR will be -combined with STDOUT. Otherwise, colorgcc just passes the output from -the compiler through without modification. +If colorgcc colorizes the output, the compiler's STDERR will be combined +with STDOUT. Otherwise, colorgcc just passes the output from the +compiler through without modification. From b0cbc68e714a0260c9380010f7533e432c7adcb7 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 3 Jan 2014 14:39:17 +0100 Subject: [PATCH 08/56] Updated README --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 7205a93..feb6c0e 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -43,6 +43,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache %doc README colorgccrc.sample %changelog +* Thu Jan 03 2014 Martin Cermak 1.3.2-10 +- Updated README + * Thu Jan 03 2014 Martin Cermak 1.3.2-9 - Renamed and updated config sample From 254c67d8f5a561641502fab188fabddfb49ab82f Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 17 Apr 2014 13:40:00 +0200 Subject: [PATCH 09/56] Allow using "color" prefix as well as "color-" prefix (bz1078180) --- colorgcc.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index feb6c0e..6ca81b7 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -11,6 +11,7 @@ Source2: README BuildArch: noarch Patch0: colorgcc-1.3.2-invocation.patch Patch1: sampleconfig.patch +Patch2: colorgcc-1.3.2-bz1078180.patch Requires: perl %description @@ -24,6 +25,7 @@ cp -p %{SOURCE1} ./colorgccrc.sample cp -p %{SOURCE2} . %patch0 -p1 %patch1 -p1 +%patch2 -p1 %install mkdir -p $RPM_BUILD_ROOT/%{_bindir} @@ -33,6 +35,12 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-cc ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-c++ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache +ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorgcc +ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorg++ +ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorcc +ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorc++ +ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache + %files %defattr(-,root,root,-) %{_bindir}/color-gcc @@ -40,9 +48,18 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-ccache %{_bindir}/color-cc %{_bindir}/color-c++ %{_bindir}/color-ccache + +%{_bindir}/colorgcc +%{_bindir}/colorg++ +%{_bindir}/colorcc +%{_bindir}/colorc++ +%{_bindir}/colorccache %doc README colorgccrc.sample %changelog +* Fri Apr 11 2014 Martin Cermak 1.3.2-11 +- Allow using "color" prefix as well as "color-" prefix (bz1078180) + * Thu Jan 03 2014 Martin Cermak 1.3.2-10 - Updated README From 6c3b1c05028ae3b38a662381fac0d45867764ccb Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 17 Apr 2014 13:49:03 +0200 Subject: [PATCH 10/56] Allow using "color" prefix as well as "color-" prefix (bz1078180) --- colorgcc-1.3.2-bz1078180.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 colorgcc-1.3.2-bz1078180.patch diff --git a/colorgcc-1.3.2-bz1078180.patch b/colorgcc-1.3.2-bz1078180.patch new file mode 100644 index 0000000..e6db007 --- /dev/null +++ b/colorgcc-1.3.2-bz1078180.patch @@ -0,0 +1,17 @@ +diff --git a/colorgcc.1.3.2.txt b/colorgcc.1.3.2.txt +index 258ab97..f7c4a1e 100644 +--- a/colorgcc.1.3.2.txt ++++ b/colorgcc.1.3.2.txt +@@ -95,6 +95,12 @@ sub initDefaults + $compilerPaths{"color-c++"} = "c++"; + $compilerPaths{"color-ccache"} = "ccache"; + ++ $compilerPaths{"colorgcc"} = "gcc"; ++ $compilerPaths{"colorg++"} = "g++"; ++ $compilerPaths{"colorcc"} = "cc"; ++ $compilerPaths{"colorc++"} = "c++"; ++ $compilerPaths{"colorccache"} = "ccache"; ++ + $nocolor{"dumb"} = "true"; + + $colors{"srcColor"} = color("cyan"); From 08e2f4b3e0f8103cb8453302a5ee5ee2f31e420a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 00:29:37 -0500 Subject: [PATCH 11/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 6ca81b7..ced7f0b 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -57,6 +57,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache %doc README colorgccrc.sample %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.3.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Apr 11 2014 Martin Cermak 1.3.2-11 - Allow using "color" prefix as well as "color-" prefix (bz1078180) From 9a6d65ac9ae33f501a8363defa14cea70bc96226 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 03:02:36 +0000 Subject: [PATCH 12/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index ced7f0b..4cd2b87 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -57,6 +57,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache %doc README colorgccrc.sample %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.3.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.3.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From c0663350d029c2c5225fce6cd068f4d16aee7877 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:57:12 +0000 Subject: [PATCH 13/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 4cd2b87..12abc4c 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -57,6 +57,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache %doc README colorgccrc.sample %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.3.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.3.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9d783f37d4716b2a5c51bf5791d31871484b6778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:08:42 +0200 Subject: [PATCH 14/56] Mandatory Perl build-requires added --- colorgcc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/colorgcc.spec b/colorgcc.spec index 12abc4c..355cfda 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -12,6 +12,7 @@ BuildArch: noarch Patch0: colorgcc-1.3.2-invocation.patch Patch1: sampleconfig.patch Patch2: colorgcc-1.3.2-bz1078180.patch +BuildRequires: perl-generators Requires: perl %description From 4ccaeec942b650eeb3f8feb4ba9a4fe82cf9d48a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:44:58 +0000 Subject: [PATCH 15/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 355cfda..7ee8fc2 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -58,6 +58,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache %doc README colorgccrc.sample %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 1.3.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5cfaba7221a6e9d2ddb5d7ccc8d783e01a4ed07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 13 Jul 2017 10:50:51 +0200 Subject: [PATCH 16/56] perl dependency renamed to perl-interpreter --- colorgcc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/colorgcc.spec b/colorgcc.spec index 7ee8fc2..5470c5e 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -13,7 +13,7 @@ Patch0: colorgcc-1.3.2-invocation.patch Patch1: sampleconfig.patch Patch2: colorgcc-1.3.2-bz1078180.patch BuildRequires: perl-generators -Requires: perl +Requires: perl-interpreter %description Perl script written by Jamie Moyers to colorize the terminal output of C++, CC, @@ -58,6 +58,10 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache %doc README colorgccrc.sample %changelog +* Thu Jul 13 2017 Petr Pisar - 1.3.2-16 +- perl dependency renamed to perl-interpreter + + * Fri Feb 10 2017 Fedora Release Engineering - 1.3.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 4b7c39351fd0c1e21e6bfd26cfd05f65fb2d1dfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 05:15:13 +0000 Subject: [PATCH 17/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 5470c5e..87c055f 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.3.2 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -58,6 +58,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache %doc README colorgccrc.sample %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.3.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jul 13 2017 Petr Pisar - 1.3.2-16 - perl dependency renamed to perl-interpreter From fd9a8622dfe1262bdb303e4885dc4013591b1bb0 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Wed, 6 Dec 2017 12:56:56 +0100 Subject: [PATCH 18/56] Rebase to colorgcc-1.4.5 per BZ#1402003. --- README | 37 ----- colorgcc-1.3.2-bz1078180.patch | 17 --- colorgcc-1.3.2-invocation.patch | 44 ------ colorgcc-invocation.patch | 23 +++ colorgcc.1.3.2.txt | 254 -------------------------------- colorgcc.spec | 31 ++-- colorgccrc.txt | 54 ------- sampleconfig.patch | 24 --- 8 files changed, 36 insertions(+), 448 deletions(-) delete mode 100644 README delete mode 100644 colorgcc-1.3.2-bz1078180.patch delete mode 100644 colorgcc-1.3.2-invocation.patch create mode 100644 colorgcc-invocation.patch delete mode 100644 colorgcc.1.3.2.txt delete mode 100644 colorgccrc.txt delete mode 100644 sampleconfig.patch diff --git a/README b/README deleted file mode 100644 index 50c7ff8..0000000 --- a/README +++ /dev/null @@ -1,37 +0,0 @@ -The colorgcc is a perl script written by Jamie Moyers to colorize the -terminal output of C++, CC, CCACHE, G++, GCC so error messages can be -found within longer compiler outputs. - -Homepage: - - http://schlueters.de/colorgcc.html - -Usage: - -Call the compiler name with the 'color-' prefix, eg: - - color-gcc - color-g++ - color-cc - color-c++ - -That's it. Alternatively you may want to create following handy aliases: - - alias gcc='color-gcc' - alias g++='color-g++' - alias cc='color-cc' - alias c++='color-c++' - -The default settings can be overridden with ~/.colorgccrc. See the -comments in the packaged sample config file for more information. - -Note: - -colorgcc will only emit color codes if: - - (1) Its STDOUT is a tty and - (2) the value of $TERM is not listed in the "nocolor" option. - -If colorgcc colorizes the output, the compiler's STDERR will be combined -with STDOUT. Otherwise, colorgcc just passes the output from the -compiler through without modification. diff --git a/colorgcc-1.3.2-bz1078180.patch b/colorgcc-1.3.2-bz1078180.patch deleted file mode 100644 index e6db007..0000000 --- a/colorgcc-1.3.2-bz1078180.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/colorgcc.1.3.2.txt b/colorgcc.1.3.2.txt -index 258ab97..f7c4a1e 100644 ---- a/colorgcc.1.3.2.txt -+++ b/colorgcc.1.3.2.txt -@@ -95,6 +95,12 @@ sub initDefaults - $compilerPaths{"color-c++"} = "c++"; - $compilerPaths{"color-ccache"} = "ccache"; - -+ $compilerPaths{"colorgcc"} = "gcc"; -+ $compilerPaths{"colorg++"} = "g++"; -+ $compilerPaths{"colorcc"} = "cc"; -+ $compilerPaths{"colorc++"} = "c++"; -+ $compilerPaths{"colorccache"} = "ccache"; -+ - $nocolor{"dumb"} = "true"; - - $colors{"srcColor"} = color("cyan"); diff --git a/colorgcc-1.3.2-invocation.patch b/colorgcc-1.3.2-invocation.patch deleted file mode 100644 index 74e5185..0000000 --- a/colorgcc-1.3.2-invocation.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/colorgcc.1.3.2.txt b/colorgcc.1.3.2.txt -index 3cc7899..258ab97 100644 ---- a/colorgcc.1.3.2.txt -+++ b/colorgcc.1.3.2.txt -@@ -14,17 +14,13 @@ - # - # Usage: - # --# In a directory that occurs in your PATH _before_ the directory --# where the compiler lives, create a softlink to colorgcc for --# each compiler you want to colorize: -+# Call the compiler name with the 'color-' prefix, eg: -+# color-gcc -+# color-g++ -+# color-cc -+# color-c++ - # --# g++ -> colorgcc --# gcc -> colorgcc --# cc -> colorgcc --# etc. --# --# That's it. When "g++" is invoked, colorgcc is run instead. --# colorgcc looks at the program name to figure out which compiler to run. -+# That's it. - # - # The default settings can be overridden with ~/.colorgccrc. - # See the comments in the sample .colorgccrc for more information. -@@ -93,10 +89,11 @@ use IPC::Open3; - - sub initDefaults - { -- $compilerPaths{"gcc"} = "/usr/bin/gcc"; -- $compilerPaths{"g++"} = "/usr/bin/g++"; -- $compilerPaths{"cc"} = "/usr/bin/cc"; -- $compilerPaths{"c++"} = "/usr/bin/c++"; -+ $compilerPaths{"color-gcc"} = "gcc"; -+ $compilerPaths{"color-g++"} = "g++"; -+ $compilerPaths{"color-cc"} = "cc"; -+ $compilerPaths{"color-c++"} = "c++"; -+ $compilerPaths{"color-ccache"} = "ccache"; - - $nocolor{"dumb"} = "true"; - diff --git a/colorgcc-invocation.patch b/colorgcc-invocation.patch new file mode 100644 index 0000000..76d59b8 --- /dev/null +++ b/colorgcc-invocation.patch @@ -0,0 +1,23 @@ +diff --git a/colorgcc.pl b/colorgcc.pl +index 92bb58c..ceb31de 100755 +--- a/colorgcc.pl ++++ b/colorgcc.pl +@@ -149,6 +149,18 @@ my($unfinishedQuote, $previousColor); + + sub initDefaults + { ++ $compilerPaths{"color-gcc"} = "gcc"; ++ $compilerPaths{"color-g++"} = "g++"; ++ $compilerPaths{"color-cc"} = "cc"; ++ $compilerPaths{"color-c++"} = "c++"; ++ $compilerPaths{"color-ccache"} = "ccache"; ++ ++ $compilerPaths{"colorgcc"} = "gcc"; ++ $compilerPaths{"colorg++"} = "g++"; ++ $compilerPaths{"colorcc"} = "cc"; ++ $compilerPaths{"colorc++"} = "c++"; ++ $compilerPaths{"colorccache"} = "ccache"; ++ + $options{"chainedPath"} = "0"; + $nocolor{"dumb"} = "true"; + diff --git a/colorgcc.1.3.2.txt b/colorgcc.1.3.2.txt deleted file mode 100644 index 3cc7899..0000000 --- a/colorgcc.1.3.2.txt +++ /dev/null @@ -1,254 +0,0 @@ -#! /usr/bin/perl -w - -# -# colorgcc -# -# Version: 1.3.2 -# -# $Id: colorgcc,v 1.10 1999/04/29 17:15:52 jamoyers Exp $ -# -# A wrapper to colorize the output from compilers whose messages -# match the "gcc" format. -# -# Requires the ANSIColor module from CPAN. -# -# Usage: -# -# In a directory that occurs in your PATH _before_ the directory -# where the compiler lives, create a softlink to colorgcc for -# each compiler you want to colorize: -# -# g++ -> colorgcc -# gcc -> colorgcc -# cc -> colorgcc -# etc. -# -# That's it. When "g++" is invoked, colorgcc is run instead. -# colorgcc looks at the program name to figure out which compiler to run. -# -# The default settings can be overridden with ~/.colorgccrc. -# See the comments in the sample .colorgccrc for more information. -# -# Note: -# -# colorgcc will only emit color codes if: -# -# (1) Its STDOUT is a tty and -# (2) the value of $TERM is not listed in the "nocolor" option. -# -# If colorgcc colorizes the output, the compiler's STDERR will be -# combined with STDOUT. Otherwise, colorgcc just passes the output from -# the compiler through without modification. -# -# Author: Jamie Moyers -# Started: April 20, 1999 -# Licence: GNU Public License -# -# Credits: -# -# I got the idea for this from a script called "color_cvs": -# color_cvs .03 Adrian Likins -# -# (Scott Harrington) -# Much improved handling of compiler command line arguments. -# exec compiler when not colorizing to preserve STDOUT, STDERR. -# Fixed my STDIN kludge. -# -# (Elias S. G. Carotti) -# Corrected handling of text like -DPACKAGE=\"Package\" -# Spotted return code bug. -# -# (Erwin S. Andreasen) -# (Steve Churchill) -# Return code bug fixes. -# -# (Rik Hemsley) -# Found STDIN bug. -# -# Changes: -# -# 1.3.2 Better handling of command line arguments to compiler. -# -# If we aren't colorizing output, we just exec the compiler which -# preserves the original STDOUT and STDERR. -# -# Removed STDIN kludge. STDIN being passed correctly now. -# -# 1.3.1 Added kludge to copy STDIN to the compiler's STDIN. -# -# 1.3.0 Now correctly returns (I hope) the return code of the compiler -# process as its own. -# -# 1.2.1 Applied patch to handle text similar to -DPACKAGE=\"Package\". -# -# 1.2.0 Added tty check. If STDOUT is not a tty, don't do color. -# -# 1.1.0 Added the "nocolor" option to turn off the color if the terminal type -# ($TERM) is listed. -# -# 1.0.0 Initial Version - -use Term::ANSIColor; -use IPC::Open3; - -sub initDefaults -{ - $compilerPaths{"gcc"} = "/usr/bin/gcc"; - $compilerPaths{"g++"} = "/usr/bin/g++"; - $compilerPaths{"cc"} = "/usr/bin/cc"; - $compilerPaths{"c++"} = "/usr/bin/c++"; - - $nocolor{"dumb"} = "true"; - - $colors{"srcColor"} = color("cyan"); - $colors{"introColor"} = color("blue"); - - $colors{"warningFileNameColor"} = color("yellow"); - $colors{"warningNumberColor"} = color("yellow"); - $colors{"warningMessageColor"} = color("yellow"); - - $colors{"errorFileNameColor"} = color("bold red"); - $colors{"errorNumberColor"} = color("bold red"); - $colors{"errorMessageColor"} = color("bold red"); -} - -sub loadPreferences -{ -# Usage: loadPreferences("filename"); - - my($filename) = @_; - - open(PREFS, "<$filename") || return; - - while() - { - next if (m/^\#.*/); # It's a comment. - next if (!m/(.*):\s*(.*)/); # It's not of the form "foo: bar". - - $option = $1; - $value = $2; - - if ($option =~ m/cc|c\+\+|gcc|g\+\+/) - { - $compilerPaths{$option} = $value; - } - elsif ($option eq "nocolor") - { - # The nocolor option lists terminal types, separated by - # spaces, not to do color on. - foreach $termtype (split(/\s+/, $value)) - { - $nocolor{$termtype} = "true"; - } - } - else - { - $colors{$option} = color($value); - } - } - close(PREFS); -} - -sub srcscan -{ -# Usage: srcscan($text, $normalColor) -# $text -- the text to colorize -# $normalColor -- The escape sequence to use for non-source text. - -# Looks for text between ` and ', and colors it srcColor. - - my($line, $normalColor) = @_; - - my($srcon) = color("reset") . $colors{"srcColor"}; - my($srcoff) = color("reset") . $normalColor; - - $line = $normalColor . $line; - - # This substitute replaces `foo' with `AfooB' where A is the escape - # sequence that turns on the the desired source color, and B is the - # escape sequence that returns to $normalColor. - $line =~ s/\`(.*?)\'/\`$srcon$1$srcoff\'/g; - - print($line, color("reset")); -} - -# -# Main program -# - -# Set up default values for colors and compilers. -initDefaults(); - -# Read the configuration file, if there is one. -$configFile = $ENV{"HOME"} . "/.colorgccrc"; -if (-f $configFile) -{ - loadPreferences($configFile); -} - -# Figure out which compiler to invoke based on our program name. -$0 =~ m%.*/(.*)$%; -$progName = $1 || $0; - -$compiler = $compilerPaths{$progName} || $compilerPaths{"gcc"}; - -# Get the terminal type. -$terminal = $ENV{"TERM"} || "dumb"; - -# If it's in the list of terminal types not to color, or if -# we're writing to something that's not a tty, don't do color. -if (! -t STDOUT || $nocolor{$terminal}) -{ - exec $compiler, @ARGV - or die("Couldn't exec"); -} - -# Keep the pid of the compiler process so we can get its return -# code and use that as our return code. -$compiler_pid = open3('<&STDIN', \*GCCOUT, '', $compiler, @ARGV); - -# Colorize the output from the compiler. -while() -{ - if (m/^(.*?):([0-9]+):(.*)$/) # filename:lineno:message - { - $field1 = $1 || ""; - $field2 = $2 || ""; - $field3 = $3 || ""; - - if ($field3 =~ m/\s+warning:.*/) - { - # Warning - print($colors{"warningFileNameColor"}, "$field1:", color("reset")); - print($colors{"warningNumberColor"}, "$field2:", color("reset")); - srcscan($field3, $colors{"warningMessageColor"}); - } - else - { - # Error - print($colors{"errorFileNameColor"}, "$field1:", color("reset")); - print($colors{"errorNumberColor"}, "$field2:", color("reset")); - srcscan($field3, $colors{"errorMessageColor"}); - } - print("\n"); - } - elsif (m/^(.*?):(.+):$/) # filename:message: - { - # No line number, treat as an "introductory" line of text. - srcscan($_, $colors{"introColor"}); - } - else # Anything else. - { - # Doesn't seem to be a warning or an error. Print normally. - print(color("reset"), $_); - } -} - -# Get the return code of the compiler and exit with that. -waitpid($compiler_pid, 0); -exit ($? >> 8); - - - - - diff --git a/colorgcc.spec b/colorgcc.spec index 87c055f..853a1ef 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,17 +1,13 @@ Summary: Script to colorize the compiler output Name: colorgcc -Version: 1.3.2 -Release: 17%{?dist} +Version: 1.4.5 +Release: 1%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html -Source0: http://schlueters.de/colorgcc.%{version}.txt -Source1: http://schlueters.de/colorgccrc.txt -Source2: README +Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz BuildArch: noarch -Patch0: colorgcc-1.3.2-invocation.patch -Patch1: sampleconfig.patch -Patch2: colorgcc-1.3.2-bz1078180.patch +Patch0: colorgcc-invocation.patch BuildRequires: perl-generators Requires: perl-interpreter @@ -20,17 +16,13 @@ Perl script written by Jamie Moyers to colorize the terminal output of C++, CC, CCACHE, G++, GCC so error messages can be found within longer compiler outputs. %prep -%setup -q -c -T -cp -p %{SOURCE0} . -cp -p %{SOURCE1} ./colorgccrc.sample -cp -p %{SOURCE2} . +%setup +mv ./colorgccrc.txt ./colorgccrc.sample %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %install mkdir -p $RPM_BUILD_ROOT/%{_bindir} -install -p -m 755 $(basename %{SOURCE0}) $RPM_BUILD_ROOT/%{_bindir}/color-gcc +install -p -m 755 colorgcc.pl $RPM_BUILD_ROOT/%{_bindir}/color-gcc ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-g++ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-cc ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/color-c++ @@ -58,6 +50,9 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache %doc README colorgccrc.sample %changelog +* Wed Dec 6 2017 Martin Cermak 1.4.5-1 +- Rebase to 1.4.5 per bz1402003. + * Wed Jul 26 2017 Fedora Release Engineering - 1.3.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild @@ -80,10 +75,10 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache * Fri Apr 11 2014 Martin Cermak 1.3.2-11 - Allow using "color" prefix as well as "color-" prefix (bz1078180) -* Thu Jan 03 2014 Martin Cermak 1.3.2-10 +* Fri Jan 03 2014 Martin Cermak 1.3.2-10 - Updated README -* Thu Jan 03 2014 Martin Cermak 1.3.2-9 +* Fri Jan 03 2014 Martin Cermak 1.3.2-9 - Renamed and updated config sample * Thu Jan 02 2014 Martin Cermak 1.3.2-8 @@ -114,6 +109,6 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache - Absolute paths pointing to compiler binaries removed - Resolves bz700833 -* Thu Apr 29 2011 Martin Cermak 1.3.2-1 +* Fri Apr 29 2011 Martin Cermak 1.3.2-1 - Packaged for Fedora diff --git a/colorgccrc.txt b/colorgccrc.txt deleted file mode 100644 index 5ec5949..0000000 --- a/colorgccrc.txt +++ /dev/null @@ -1,54 +0,0 @@ -# -# colorgcc configuration file -# -# $Id: colorgccrc,v 1.1.1.1 1999/04/25 15:24:03 jamoyers Exp $ -# -# This file should be named $HOME/.colorgccrc -# -# -# The following groups of attributes may be combined for a given color: -# -# clear black on_black -# reset red on_red -# bold green on_green -# underline yellow on_yellow -# underscore blue on_blue -# blink magenta on_magenta -# reverse cyan on_cyan -# concealed white on_white -# -# For example, srcColor: bold cyan on_yellow -# - -# Define the paths to the actual location of the various compilers. -# (Currently, colorgcc only understands these: g++ gcc c++ cc) -g++: /usr/bin/g++ -gcc: /usr/bin/gcc -c++: /usr/bin/c++ -cc: /usr/bin/cc - -# Don't do color if our terminal type ($TERM) is one of these. -# (List all terminal types on one line, seperated by whitespace.) -nocolor: dumb - -# Text between ` and ' is usually source code. -srcColor: bold cyan - -# Text other than a warning or error. -introColor: reset - -# Warnings and errors both have similar formats: -# filename:999:Message -# Each field may be assigned a different color. - -# Warnings -warningFileNameColor: reset -warningNumberColor: white -warningMessageColor: yellow - -# Errors -errorFileNameColor: reset -errorNumberColor: white -errorMessageColor: bold red - - diff --git a/sampleconfig.patch b/sampleconfig.patch deleted file mode 100644 index 7263051..0000000 --- a/sampleconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/colorgccrc.sample b/colorgccrc.sample -index 5ec5949..8e87f98 100644 ---- a/colorgccrc.sample -+++ b/colorgccrc.sample -@@ -20,12 +20,14 @@ - # For example, srcColor: bold cyan on_yellow - # - --# Define the paths to the actual location of the various compilers. -+# Define the paths to the actual location of the various compilers. By default -+# colorgcc calls basenames (e.g. 'gcc') so that $PATH setting is important. - # (Currently, colorgcc only understands these: g++ gcc c++ cc) --g++: /usr/bin/g++ --gcc: /usr/bin/gcc --c++: /usr/bin/c++ --cc: /usr/bin/cc -+# -+# g++: /usr/bin/g++ -+# gcc: /usr/bin/gcc -+# c++: /usr/bin/c++ -+# cc: /usr/bin/cc - - # Don't do color if our terminal type ($TERM) is one of these. - # (List all terminal types on one line, seperated by whitespace.) From 07f59f8ba0d339a111d46020e0e3dd685d55ed2e Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Wed, 6 Dec 2017 13:08:07 +0100 Subject: [PATCH 19/56] Upload new sources: 1.4.5.tar.gz. --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index e69de29..392665b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (1.4.5.tar.gz) = 4125ada9b65b6387c2c259e2347236b3b18f7cdbf06ae0bb0212474a11354be6d463fbc4d239c2eb666c8246fc20277e06c8272fdee6dd4f60caa66164bcc1cf From ff11805c6bb87c1f87b0a76e26b8338b181e3b9f Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 8 Dec 2017 13:58:45 +0100 Subject: [PATCH 20/56] 1.4.5-2: Provide convenience symlinks per bz1402003#c10 --- colorgcc.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 853a1ef..7131736 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -34,6 +34,11 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorcc ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorc++ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/colorgcc +for n in cc gcc g++ c++ ; do + ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT%{_libdir}/colorgcc/$n +done + %files %defattr(-,root,root,-) %{_bindir}/color-gcc @@ -47,9 +52,16 @@ ln -s %{_bindir}/color-gcc $RPM_BUILD_ROOT/%{_bindir}/colorccache %{_bindir}/colorcc %{_bindir}/colorc++ %{_bindir}/colorccache + +%dir %{_libdir}/colorgcc +%{_libdir}/colorgcc/* + %doc README colorgccrc.sample %changelog +* Fri Dec 8 2017 Martin Cermak 1.4.5-2 +- Provide convenience symlinks per bz1402003#c10 + * Wed Dec 6 2017 Martin Cermak 1.4.5-1 - Rebase to 1.4.5 per bz1402003. From 0a5b775fec549121008171860733f528046f6896 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 8 Dec 2017 15:25:33 +0100 Subject: [PATCH 21/56] 1.4.5-3: Update README --- colorgcc.spec | 9 ++++++--- readme-fedora.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 readme-fedora.patch diff --git a/colorgcc.spec b/colorgcc.spec index 7131736..08d25cc 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,13 +1,14 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz BuildArch: noarch Patch0: colorgcc-invocation.patch +Patch1: readme-fedora.patch BuildRequires: perl-generators Requires: perl-interpreter @@ -19,6 +20,7 @@ CCACHE, G++, GCC so error messages can be found within longer compiler outputs. %setup mv ./colorgccrc.txt ./colorgccrc.sample %patch0 -p1 +%patch1 -p1 %install mkdir -p $RPM_BUILD_ROOT/%{_bindir} @@ -59,11 +61,12 @@ done %doc README colorgccrc.sample %changelog -* Fri Dec 8 2017 Martin Cermak 1.4.5-2 +* Fri Dec 8 2017 Martin Cermak 1.4.5-3 - Provide convenience symlinks per bz1402003#c10 +- Update README * Wed Dec 6 2017 Martin Cermak 1.4.5-1 -- Rebase to 1.4.5 per bz1402003. +- Rebase to 1.4.5 per bz1402003 * Wed Jul 26 2017 Fedora Release Engineering - 1.3.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/readme-fedora.patch b/readme-fedora.patch new file mode 100644 index 0000000..65e9c6e --- /dev/null +++ b/readme-fedora.patch @@ -0,0 +1,31 @@ +diff --git a/README b/README +index 2f38386..b5b978f 100644 +--- a/README ++++ b/README +@@ -48,6 +48,26 @@ If colorgcc colorizes the output, the compiler's STDERR will be + combined with STDOUT. Otherwise, colorgcc just passes the output from + the compiler through without modification. + ++Fedora note: ++ ++Here is how to use colorgcc along with ccache on a Fedora system under ++a non-root user. Install both colorgcc and ccache. The ccache ++modifies user $PATH via it's /etc/profile.d/ccache* scripts. ++Now do the following: ++ ++ $ export PATH="/usr/lib/colorgcc:$PATH" ++ $ export CCACHE_PATH="/usr/bin" ++ ++Now add entries like the following to your ~/.colorgccrc file: ++ ++ g++: /usr/lib64/ccache/g++ ++ gcc: /usr/lib64/ccache/gcc ++ c++: /usr/lib64/ccache/g++ ++ cc: /usr/lib64/ccache/cc ++ ++You should be all set. ++ ++ + Author: Jamie Moyers + Started: April 20, 1999 + Licence: GNU Public License From b8b3133f32e20d3e1708ce53e33e312546e38a7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:27:05 +0000 Subject: [PATCH 22/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 08d25cc..3e8f237 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -61,6 +61,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.4.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Dec 8 2017 Martin Cermak 1.4.5-3 - Provide convenience symlinks per bz1402003#c10 - Update README From f29ffc4799343475898f1990d96d14208721e535 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:32:03 -0500 Subject: [PATCH 23/56] Remove needless use of %defattr --- colorgcc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 3e8f237..98886a9 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -42,7 +42,6 @@ for n in cc gcc g++ c++ ; do done %files -%defattr(-,root,root,-) %{_bindir}/color-gcc %{_bindir}/color-g++ %{_bindir}/color-cc From 06ce57544946f2e94abea2e5c9f117660d13a905 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:04:42 +0000 Subject: [PATCH 24/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 98886a9..3a8395c 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL+ Group: Development/Tools Url: http://schlueters.de/colorgcc.html @@ -60,6 +60,9 @@ done %doc README colorgccrc.sample %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.4.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.4.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a0bdc6130006f404b7cba783b9e3b46112d254c8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:41 +0100 Subject: [PATCH 25/56] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- colorgcc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 3a8395c..b0b0ad7 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -3,7 +3,6 @@ Name: colorgcc Version: 1.4.5 Release: 5%{?dist} License: GPL+ -Group: Development/Tools Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz BuildArch: noarch From dca88cca8b85c65a1dec997354e050328dfc8ee7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:01:43 +0000 Subject: [PATCH 26/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index b0b0ad7..e97bba4 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.4.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1.4.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 48e87677e8639d8e15e51b8edbe537aef0548a90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 20:43:37 +0000 Subject: [PATCH 27/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index e97bba4..7579231 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.4.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.4.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 32fceecc90375088b0dde592517b7aa71e032f20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 14:33:01 +0000 Subject: [PATCH 28/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 7579231..86a1815 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.4.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.4.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From db34591db5019dccd498e80aa5e44e8584475671 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:21:57 +0000 Subject: [PATCH 29/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 86a1815..2dff325 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.4.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.4.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 022308ce2208113b28c3ac0d5a41041b8a62360e Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Wed, 25 Nov 2020 11:57:00 +0100 Subject: [PATCH 30/56] NVR bump and rebuild for CI gating changes --- colorgcc.spec | 5 ++++- gating.yaml | 13 +++++++++++++ tests/my-smoketest/PURPOSE | 3 +++ tests/my-smoketest/runtest.sh | 9 +++++++++ tests/tests.yml | 11 +++++++++++ 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gating.yaml create mode 100644 tests/my-smoketest/PURPOSE create mode 100755 tests/my-smoketest/runtest.sh create mode 100644 tests/tests.yml diff --git a/colorgcc.spec b/colorgcc.spec index 2dff325..65bae76 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Fri Dec 8 2017 Martin Cermak 1.4.5-10 +- NVR bump and rebuild for CI gating changes + * Mon Jul 27 2020 Fedora Release Engineering - 1.4.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..7e6c3f9 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,13 @@ +--- !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: osci.brew-build.tier0.functional} diff --git a/tests/my-smoketest/PURPOSE b/tests/my-smoketest/PURPOSE new file mode 100644 index 0000000..120f3ac --- /dev/null +++ b/tests/my-smoketest/PURPOSE @@ -0,0 +1,3 @@ +Test Name: my-smoketest +Author: +Short Description: Run a minimal colorgcc test diff --git a/tests/my-smoketest/runtest.sh b/tests/my-smoketest/runtest.sh new file mode 100755 index 0000000..f889ad6 --- /dev/null +++ b/tests/my-smoketest/runtest.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -xe + +echo -e 'int main() {\nreturn 0;\n}' | color-gcc -xc -o /dev/null - +echo -e 'int main() {\nreturn 0\n}' | color-gcc -xc -o /dev/null - |& fgrep ':2:9: error' + +echo +echo RESULT: PASS diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..533fd58 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,11 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + tests: + - my-smoketest + required_packages: + - gcc + - colorgcc From d736a4d5e74b5ad9b1d7564cadb85ccfcad60507 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Wed, 25 Nov 2020 12:00:43 +0100 Subject: [PATCH 31/56] Fix changelog date --- colorgcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 65bae76..98698bd 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -59,7 +59,7 @@ done %doc README colorgccrc.sample %changelog -* Fri Dec 8 2017 Martin Cermak 1.4.5-10 +* Wed Nov 25 2020 Martin Cermak 1.4.5-10 - NVR bump and rebuild for CI gating changes * Mon Jul 27 2020 Fedora Release Engineering - 1.4.5-9 From f568f380a7b0eac9cebcc6eab98edfee2581cc99 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 26 Nov 2020 12:56:19 +0100 Subject: [PATCH 32/56] Set up a plan --- .fmf/version | 1 + plans/ci.fmf | 6 ++++++ tests/my-smoketest/PURPOSE | 3 --- tests/my-smoketest/runtest.sh | 9 --------- tests/tests.yml | 11 ----------- 5 files changed, 7 insertions(+), 23 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/ci.fmf delete mode 100644 tests/my-smoketest/PURPOSE delete mode 100755 tests/my-smoketest/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..006286f --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + repository: tests/ +execute: + how: beakerlib diff --git a/tests/my-smoketest/PURPOSE b/tests/my-smoketest/PURPOSE deleted file mode 100644 index 120f3ac..0000000 --- a/tests/my-smoketest/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -Test Name: my-smoketest -Author: -Short Description: Run a minimal colorgcc test diff --git a/tests/my-smoketest/runtest.sh b/tests/my-smoketest/runtest.sh deleted file mode 100755 index f889ad6..0000000 --- a/tests/my-smoketest/runtest.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -xe - -echo -e 'int main() {\nreturn 0;\n}' | color-gcc -xc -o /dev/null - -echo -e 'int main() {\nreturn 0\n}' | color-gcc -xc -o /dev/null - |& fgrep ':2:9: error' - -echo -echo RESULT: PASS diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 533fd58..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - tests: - - my-smoketest - required_packages: - - gcc - - colorgcc From 92e6374c37fd36bbe2b184f09383708139b43e36 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 26 Nov 2020 13:16:55 +0100 Subject: [PATCH 33/56] tests first commit --- tests/Sanity/smoke/Makefile | 63 +++++++++++++++++++++++++++++++++++ tests/Sanity/smoke/PURPOSE | 3 ++ tests/Sanity/smoke/runtest.sh | 44 ++++++++++++++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 tests/Sanity/smoke/Makefile create mode 100644 tests/Sanity/smoke/PURPOSE create mode 100755 tests/Sanity/smoke/runtest.sh diff --git a/tests/Sanity/smoke/Makefile b/tests/Sanity/smoke/Makefile new file mode 100644 index 0000000..8cf4641 --- /dev/null +++ b/tests/Sanity/smoke/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /tools/colorgcc/Sanity/basic +# Description: basic smoke test +# Author: Martin Cermak +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2020 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/colorgcc/Sanity/basic +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: Martin Cermak " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: basic smoke test" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 48h" >> $(METADATA) + @echo "RunFor: colorgcc" >> $(METADATA) + @echo "Requires: colorgcc gcc" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2+" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/Sanity/smoke/PURPOSE b/tests/Sanity/smoke/PURPOSE new file mode 100644 index 0000000..bf19f89 --- /dev/null +++ b/tests/Sanity/smoke/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /tools/colorgcc/Sanity/basic +Description: basic smoke test +Author: Martin Cermak diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..0a001f0 --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /tools/colorgcc/Sanity/basic +# Description: basic smoke test +# Author: Martin Cermak +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2020 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/bin/rhts-environment.sh || exit 1 +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGE="colorgcc" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm $PACKAGE + rlPhaseEnd + + rlPhaseStartTest + rlRun "echo -e 'int main() {\nreturn 0;\n}' | color-gcc -xc -o /dev/null -" + rlRun "echo -e 'int main() {\nreturn 0\n}' | color-gcc -xc -o /dev/null - |& fgrep ':2:9: error'" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd From 96589a89f62e5862c22cd32d16945da29e63ff9d Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 26 Nov 2020 13:22:58 +0100 Subject: [PATCH 34/56] Convert the testcase to FMF --- tests/Sanity/smoke/main.fmf | 14 ++++++++++++++ tests/Sanity/smoke/runtest.sh | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 tests/Sanity/smoke/main.fmf diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..0c5aa8b --- /dev/null +++ b/tests/Sanity/smoke/main.fmf @@ -0,0 +1,14 @@ +summary: basic smoke test +description: '' +contact: +- Martin Cermak +component: +- colorgcc +test: ./runtest.sh +framework: beakerlib +recommend: +- colorgcc +- gcc +duration: 48h +extra-summary: /tools/colorgcc/Sanity/basic +extra-task: /tools/colorgcc/Sanity/basic diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh index 0a001f0..708bfe8 100755 --- a/tests/Sanity/smoke/runtest.sh +++ b/tests/Sanity/smoke/runtest.sh @@ -26,7 +26,6 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 PACKAGE="colorgcc" From 21f40254a8ed5ec6160768e84140b3ae4f3ec62c Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 26 Nov 2020 13:45:23 +0100 Subject: [PATCH 35/56] Fix tests location --- plans/ci.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 006286f..1ad2c12 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,6 @@ summary: CI Gating Plan discover: how: fmf - repository: tests/ + directory: tests execute: how: beakerlib From 90ae35229f959214fdffe89b9c22baab0725958f Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 26 Nov 2020 13:48:17 +0100 Subject: [PATCH 36/56] Update the PassingTestCaseRule for Fedora gating. --- gating.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 7e6c3f9..cbad2dc 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,7 +4,7 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.other.functional} --- !Policy product_versions: - rhel-8 From d227b1f6ee88bfccedb74db4a684ec118a0c24e1 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 26 Nov 2020 13:56:27 +0100 Subject: [PATCH 37/56] NVR bump and rebuild for CI gating changes --- colorgcc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colorgcc.spec b/colorgcc.spec index 98698bd..be5c3e7 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,7 +59,7 @@ done %doc README colorgccrc.sample %changelog -* Wed Nov 25 2020 Martin Cermak 1.4.5-10 +* Wed Nov 26 2020 Martin Cermak 1.4.5-11 - NVR bump and rebuild for CI gating changes * Mon Jul 27 2020 Fedora Release Engineering - 1.4.5-9 From 2619a2408552ab20a31e90fec02b864653b0d8c2 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 26 Nov 2020 14:55:03 +0100 Subject: [PATCH 38/56] NVR bump and rebuild for CI gating changes --- colorgcc.spec | 4 ++-- gating.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/colorgcc.spec b/colorgcc.spec index be5c3e7..d74af80 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,7 +59,7 @@ done %doc README colorgccrc.sample %changelog -* Wed Nov 26 2020 Martin Cermak 1.4.5-11 +* Wed Nov 26 2020 Martin Cermak 1.4.5-12 - NVR bump and rebuild for CI gating changes * Mon Jul 27 2020 Fedora Release Engineering - 1.4.5-9 diff --git a/gating.yaml b/gating.yaml index cbad2dc..7e6c3f9 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,7 +4,7 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.other.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} --- !Policy product_versions: - rhel-8 From 5d1494405bf6197854d752fb8693bae8e9e80717 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Thu, 26 Nov 2020 15:10:39 +0100 Subject: [PATCH 39/56] NVR bump and rebuild for CI gating changes --- colorgcc.spec | 4 ++-- gating.yaml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/colorgcc.spec b/colorgcc.spec index d74af80..1e68308 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,7 +59,7 @@ done %doc README colorgccrc.sample %changelog -* Wed Nov 26 2020 Martin Cermak 1.4.5-12 +* Wed Nov 26 2020 Martin Cermak 1.4.5-13 - NVR bump and rebuild for CI gating changes * Mon Jul 27 2020 Fedora Release Engineering - 1.4.5-9 diff --git a/gating.yaml b/gating.yaml index 7e6c3f9..8b52293 100644 --- a/gating.yaml +++ b/gating.yaml @@ -11,3 +11,9 @@ product_versions: decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} From ec7b0f1465443d0f462baacc06b41b51a0c54fa5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:21:37 +0000 Subject: [PATCH 40/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 1e68308..9349554 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Nov 26 2020 Martin Cermak 1.4.5-13 - NVR bump and rebuild for CI gating changes From 6b660b27f2e947d511e9273fbd39a443f8710084 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:52:58 +0000 Subject: [PATCH 41/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 9f76e605adee3073b20b210c849fd5660b01d644 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 19:51:13 +0000 Subject: [PATCH 42/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 9349554..7a5c87d 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.4.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.4.5-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9b3f3e11c7c4e9131e2f7d85c03b532a66d6255a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:38:23 +0000 Subject: [PATCH 43/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 7a5c87d..1697513 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.4.5-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.4.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9098e6f1d87de017151e566deb9f119f17114360 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:22:55 +0000 Subject: [PATCH 44/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 1697513..33d19bc 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.4.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.4.5-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 69e7633a959af1affad717da16588949bec4eeab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:18:41 +0000 Subject: [PATCH 45/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 33d19bc..3f4b463 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 17%{?dist} +Release: 18%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.4.5-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.4.5-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From ea54fd8553c518553e33d3250bf791c0e58c0e1f Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Wed, 29 Mar 2023 16:52:57 +0200 Subject: [PATCH 46/56] NVR bump and rebuild for CI gating changes --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 3f4b463..88f33fe 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 18%{?dist} +Release: 19%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Mar 29 2023 Martin Cermak - 1.4.5-19 +- NVR bump and rebuild for CI gating changes + * Thu Jan 19 2023 Fedora Release Engineering - 1.4.5-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 57937ea6b933a23f24ba61aa80098bf77048e335 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Wed, 29 Mar 2023 17:26:43 +0200 Subject: [PATCH 47/56] NVR bump and rebuild for CI gating changes --- colorgcc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colorgcc.spec b/colorgcc.spec index 88f33fe..49e6991 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,7 +59,7 @@ done %doc README colorgccrc.sample %changelog -* Wed Mar 29 2023 Martin Cermak - 1.4.5-19 +* Wed Mar 29 2023 Martin Cermak - 1.4.5-20 - NVR bump and rebuild for CI gating changes * Thu Jan 19 2023 Fedora Release Engineering - 1.4.5-18 From beb625bbd726738208c269c8bec8580e930e5e13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:09:53 +0000 Subject: [PATCH 48/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 49e6991..b19f3da 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.4.5-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Mar 29 2023 Martin Cermak - 1.4.5-20 - NVR bump and rebuild for CI gating changes From df3c6c2a430701b92509f24e30199e48fa79c306 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:57:05 +0000 Subject: [PATCH 49/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index b19f3da..b8d128c 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 21%{?dist} +Release: 22%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.4.5-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.4.5-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ee7231146814ffc72067964a1f2306d252c833fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 07:47:00 +0000 Subject: [PATCH 50/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index b8d128c..13863a2 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 22%{?dist} +Release: 23%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.4.5-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.4.5-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b30a90dd8d754fc089fa7ea35a2eacdb7211601c Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Sun, 10 Mar 2024 07:40:48 +0100 Subject: [PATCH 51/56] NVR bump and rebuild for CI gating changes --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 13863a2..8bafc17 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 23%{?dist} +Release: 24%{?dist} License: GPL+ Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Sun Mar 10 2024 Martin Cermak - 1.4.5-24 +- NVR bump and rebuild for CI gating changes + * Wed Jan 24 2024 Fedora Release Engineering - 1.4.5-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1a42b3cd4bdf282a83aed422ebc2cb4fcf8e6215 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 52/56] Eliminate use of obsolete %patchN syntax (#2283636) --- colorgcc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colorgcc.spec b/colorgcc.spec index 8bafc17..0499c41 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -18,8 +18,8 @@ CCACHE, G++, GCC so error messages can be found within longer compiler outputs. %prep %setup mv ./colorgccrc.txt ./colorgccrc.sample -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 %install mkdir -p $RPM_BUILD_ROOT/%{_bindir} From d39ddb2be4640d9964c49068065d82064dd40d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 17 Jun 2024 12:25:01 +0200 Subject: [PATCH 53/56] convert GPL+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- colorgcc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/colorgcc.spec b/colorgcc.spec index 0499c41..c741812 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,8 +1,8 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 24%{?dist} -License: GPL+ +Release: 25%{?dist} +License: GPL-1.0-or-later Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz BuildArch: noarch @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Mon Jun 17 2024 Miroslav Suchý - 1.4.5-25 +- convert license to SPDX + * Sun Mar 10 2024 Martin Cermak - 1.4.5-24 - NVR bump and rebuild for CI gating changes From 69e0306bae55834fb224751dcd912dd5166537fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:46:33 +0000 Subject: [PATCH 54/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index c741812..7f519e0 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 25%{?dist} +Release: 26%{?dist} License: GPL-1.0-or-later Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.4.5-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jun 17 2024 Miroslav Suchý - 1.4.5-25 - convert license to SPDX From 71a9656a9b6b08fc7aa10159101ef47d3a41a4de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:16:26 +0000 Subject: [PATCH 55/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index 7f519e0..cdb6fbe 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 26%{?dist} +Release: 27%{?dist} License: GPL-1.0-or-later Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.4.5-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.4.5-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ab629fee2379282c71f89ff9318a96e90c78ca6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:33:00 +0000 Subject: [PATCH 56/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- colorgcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/colorgcc.spec b/colorgcc.spec index cdb6fbe..eb39b62 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,7 +1,7 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 27%{?dist} +Release: 28%{?dist} License: GPL-1.0-or-later Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz @@ -59,6 +59,9 @@ done %doc README colorgccrc.sample %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.4.5-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.4.5-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild