From 19badf6090964166e036965f38accd0c8a7eabe7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:55:59 +0000 Subject: [PATCH 01/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vgrep.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vgrep.spec b/vgrep.spec index 3404b7b..4f8c459 100644 --- a/vgrep.spec +++ b/vgrep.spec @@ -17,7 +17,7 @@ directory trees or showing the context lines before and after the matches.} %bcond_without check Name: vgrep -Release: 3%{?dist} +Release: 4%{?dist} Summary: User-friendly pager for grep License: GPLv3 URL: %{gourl} @@ -63,6 +63,9 @@ install -D -p -m 0644 docs/vgrep.1 %{buildroot}%{_mandir}/man1/vgrep.1 %gopkgfiles %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f773db84538561a289cb35601f7b8f7039d9443c Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 25 Jan 2022 13:24:07 -0600 Subject: [PATCH 02/22] Enable rpmautospec --- changelog | 31 +++++++++++++++++++++++++++++++ vgrep.spec | 34 ++-------------------------------- 2 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..a4f19d2 --- /dev/null +++ b/changelog @@ -0,0 +1,31 @@ +* Sat Jan 22 2022 Fedora Release Engineering - 2.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 8 12:50:39 CET 2021 Robert-André Mauchin - 2.5.1-1 +- Update to 2.5.1 +- Close: rhbz#1897608 + +* Sun Nov 01 2020 Carl George - 2.5.0-1 +- Latest upstream +- Include man page + +* Tue Aug 18 2020 Carl George - 2.4.0-1 +- Latest upstream + +* Wed Jul 29 2020 Fedora Release Engineering - 2.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Carl George - 2.3.3-1 +- Latest upstream + +* Wed Jul 01 2020 Carl George - 2.3.1-2 +- Embed version into binary + +* Mon Jun 29 2020 Carl George - 2.3.1-1 +- Initial package diff --git a/vgrep.spec b/vgrep.spec index 4f8c459..5da44f3 100644 --- a/vgrep.spec +++ b/vgrep.spec @@ -17,7 +17,7 @@ directory trees or showing the context lines before and after the matches.} %bcond_without check Name: vgrep -Release: 4%{?dist} +Release: %autorelease Summary: User-friendly pager for grep License: GPLv3 URL: %{gourl} @@ -63,34 +63,4 @@ install -D -p -m 0644 docs/vgrep.1 %{buildroot}%{_mandir}/man1/vgrep.1 %gopkgfiles %changelog -* Sat Jan 22 2022 Fedora Release Engineering - 2.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 2.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 8 12:50:39 CET 2021 Robert-André Mauchin - 2.5.1-1 -- Update to 2.5.1 -- Close: rhbz#1897608 - -* Sun Nov 01 2020 Carl George - 2.5.0-1 -- Latest upstream -- Include man page - -* Tue Aug 18 2020 Carl George - 2.4.0-1 -- Latest upstream - -* Wed Jul 29 2020 Fedora Release Engineering - 2.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 20 2020 Carl George - 2.3.3-1 -- Latest upstream - -* Wed Jul 01 2020 Carl George - 2.3.1-2 -- Embed version into binary - -* Mon Jun 29 2020 Carl George - 2.3.1-1 -- Initial package +%autochangelog From 139d2e268bde6f63f56b0e7747a282327d7f35d7 Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 25 Jan 2022 13:25:32 -0600 Subject: [PATCH 03/22] Latest upstream 2.6.0 Resolves: rhbz#2010012 --- sources | 2 +- vgrep.spec | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sources b/sources index bdbe8a5..8c62b71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vgrep-2.5.1.tar.gz) = 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd +SHA512 (vgrep-2.6.0.tar.gz) = 712ca1ab4318a69fbb9f0e60343c188b292c59c52ca488adb1db546937822b0e49a49541e2b9e69cec6b721003198518f530521f4c726988516bcd64e7247846 diff --git a/vgrep.spec b/vgrep.spec index 5da44f3..44f337c 100644 --- a/vgrep.spec +++ b/vgrep.spec @@ -1,6 +1,6 @@ # https://github.com/vrothberg/vgrep %global goipath github.com/vrothberg/vgrep -Version: 2.5.1 +Version: 2.6.0 %gometa @@ -24,10 +24,12 @@ URL: %{gourl} Source0: %{gosource} BuildRequires: golang(github.com/jessevdk/go-flags) +BuildRequires: golang(github.com/json-iterator/go) BuildRequires: golang(github.com/mattn/go-shellwords) BuildRequires: golang(github.com/nightlyone/lockfile) BuildRequires: golang(github.com/peterh/liner) BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(golang.org/x/term) BuildRequires: go-md2man From 2cf97e8fd23fd995dc33e523c29efff9c2465200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Jun 2022 12:24:07 +0200 Subject: [PATCH 04/22] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 From 224c295e7f0dc7ca72cc5c8983b38f64d54ba949 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Jul 2022 13:59:14 -0500 Subject: [PATCH 05/22] Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang From 5a5b28d86eb742dec4e3cec7545df30c64e5522b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:50:18 +0000 Subject: [PATCH 06/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 1327f9b1d671bf19caa8425bffba8c1ad1bc3ce4 Mon Sep 17 00:00:00 2001 From: Carl George Date: Mon, 10 Oct 2022 19:10:09 -0500 Subject: [PATCH 07/22] Update to 2.6.1, resolves rhbz#2122034 --- sources | 2 +- vgrep.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8c62b71..e32d746 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vgrep-2.6.0.tar.gz) = 712ca1ab4318a69fbb9f0e60343c188b292c59c52ca488adb1db546937822b0e49a49541e2b9e69cec6b721003198518f530521f4c726988516bcd64e7247846 +SHA512 (vgrep-2.6.1.tar.gz) = f61db1d6564ad63599f3e21ee83fda254cfd808324115cfa6edce85804f43a89fcec2c2f191e0ddd07c9fd0c99ca2811b80d2774d1765cc8100a29b89cf768f9 diff --git a/vgrep.spec b/vgrep.spec index 44f337c..d0336ec 100644 --- a/vgrep.spec +++ b/vgrep.spec @@ -1,6 +1,6 @@ # https://github.com/vrothberg/vgrep %global goipath github.com/vrothberg/vgrep -Version: 2.6.0 +Version: 2.6.1 %gometa @@ -23,6 +23,7 @@ License: GPLv3 URL: %{gourl} Source0: %{gosource} +BuildRequires: golang(github.com/google/shlex) BuildRequires: golang(github.com/jessevdk/go-flags) BuildRequires: golang(github.com/json-iterator/go) BuildRequires: golang(github.com/mattn/go-shellwords) From d1d956e7f40e9f838d4a421279705c9601eb96cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:15:26 +0000 Subject: [PATCH 08/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From a66191187977c4d1ef76fa3f377bf1f23711b461 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:35:46 +0000 Subject: [PATCH 09/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c324e765a4ff7aae0009dbb971691f02ab4dd2af Mon Sep 17 00:00:00 2001 From: Carl George Date: Wed, 29 Nov 2023 16:38:35 -0600 Subject: [PATCH 10/22] Update to version 2.7.0, resolves rhbz#2245195 - Switch to automatically generated buildrequires - Switch to SPDX license identifier - Disable i686 build --- sources | 2 +- vgrep.spec | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/sources b/sources index e32d746..0f09daa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vgrep-2.6.1.tar.gz) = f61db1d6564ad63599f3e21ee83fda254cfd808324115cfa6edce85804f43a89fcec2c2f191e0ddd07c9fd0c99ca2811b80d2774d1765cc8100a29b89cf768f9 +SHA512 (vgrep-2.7.0.tar.gz) = 5cc9e866c6de9b024d29dc9aeeb87d6eea23becde63968b2a9266412bbe44920fa13d5e7dda47bb46135301ff7f5fd79e02ec2da8a9a694183d9e63aad64478d diff --git a/vgrep.spec b/vgrep.spec index d0336ec..e099a37 100644 --- a/vgrep.spec +++ b/vgrep.spec @@ -1,8 +1,8 @@ # https://github.com/vrothberg/vgrep %global goipath github.com/vrothberg/vgrep -Version: 2.6.1 +Version: 2.7.0 -%gometa +%gometa -f %global common_description %{expand: vgrep is a pager for grep, git-grep, ripgrep and similar grep implementations, @@ -19,29 +19,22 @@ directory trees or showing the context lines before and after the matches.} Name: vgrep Release: %autorelease Summary: User-friendly pager for grep -License: GPLv3 +License: GPL-3.0-only URL: %{gourl} -Source0: %{gosource} - -BuildRequires: golang(github.com/google/shlex) -BuildRequires: golang(github.com/jessevdk/go-flags) -BuildRequires: golang(github.com/json-iterator/go) -BuildRequires: golang(github.com/mattn/go-shellwords) -BuildRequires: golang(github.com/nightlyone/lockfile) -BuildRequires: golang(github.com/peterh/liner) -BuildRequires: golang(github.com/sirupsen/logrus) -BuildRequires: golang(golang.org/x/term) +Source: %{gosource} BuildRequires: go-md2man -%description -%{common_description} +%description %{common_description} %gopkg %prep %goprep +%generate_buildrequires +%go_generate_buildrequires + %build export LDFLAGS="-X main.version=%{version} " %gobuild -o %{gobuilddir}/bin/vgrep %{goipath} From 10344451ddb59b7a8a5ec28ac8c93eb772c9c225 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:42:05 +0000 Subject: [PATCH 11/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 29d1bba094764773eb665bbb0e5ca97733f57899 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 23:40:57 +0000 Subject: [PATCH 12/22] Rebuild for golang 1.22.0 From 8104781f469dc4ae6c57be362ed9dd005b279a4d Mon Sep 17 00:00:00 2001 From: Carl George Date: Fri, 5 Jul 2024 14:40:30 -0500 Subject: [PATCH 13/22] Update to 2.8.0 rhbz#2282260 --- sources | 2 +- vgrep.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 0f09daa..d6d31f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vgrep-2.7.0.tar.gz) = 5cc9e866c6de9b024d29dc9aeeb87d6eea23becde63968b2a9266412bbe44920fa13d5e7dda47bb46135301ff7f5fd79e02ec2da8a9a694183d9e63aad64478d +SHA512 (vgrep-2.8.0.tar.gz) = 1fbd674a7fddffede70a9d0715bf09359d48abf5c238cace43996a222e3e34ec73a7911f62b8476a2dcef40485ce192476067fd99d52b7fa0e7e3fe9297f461e diff --git a/vgrep.spec b/vgrep.spec index e099a37..f964bb4 100644 --- a/vgrep.spec +++ b/vgrep.spec @@ -1,6 +1,6 @@ # https://github.com/vrothberg/vgrep %global goipath github.com/vrothberg/vgrep -Version: 2.7.0 +Version: 2.8.0 %gometa -f From 230956a8ca0b75ffd4e2b5e275ca4b6030a7c5fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:44:31 +0000 Subject: [PATCH 14/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c182609f7fc5da3d314101776140e847fd5ce4f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:18:17 +0000 Subject: [PATCH 15/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From cd441832fb62cd9a05cf55d214ad72320add10c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:04:06 +0000 Subject: [PATCH 16/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a76768011b5294fc63566b1016aec02ea6f0bd0a Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 18:44:42 -0500 Subject: [PATCH 17/22] Rebuild for golang-1.25.0 From a86f36a4923178b37297e962dd8a14fe2f43740c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 15:14:45 +0200 Subject: [PATCH 18/22] rebuild From 5652affca38a38fbb123b4412bd7346485a883ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:53:23 +0000 Subject: [PATCH 19/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 19223e0e66252638b13b79c745df336116dcb538 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 2 Feb 2026 20:02:45 -0600 Subject: [PATCH 20/22] Rebuild for https://fedoraproject.org/wiki/Changes/golang1.26 From 7c11e4c98a6f62c635d490489adfc21ea6978a96 Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 19 Mar 2026 18:45:28 -0500 Subject: [PATCH 21/22] Port to new golang packaging guidelines - Use vendor tarball for build dependencies - Remove golang-github-vrothberg-vgrep-devel subpackage rhbz#2446694 --- .gitignore | 3 +- sources | 1 + vgrep.spec | 83 +++++++++++++++++++++++++++++------------------------- 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index e7267fb..7a2de98 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -vgrep-*.tar.gz +/vgrep-*.tar.gz +/vgrep-*-vendor.tar.bz2 diff --git a/sources b/sources index d6d31f5..e798e83 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (vgrep-2.8.0.tar.gz) = 1fbd674a7fddffede70a9d0715bf09359d48abf5c238cace43996a222e3e34ec73a7911f62b8476a2dcef40485ce192476067fd99d52b7fa0e7e3fe9297f461e +SHA512 (vgrep-2.8.0-vendor.tar.bz2) = 56eb03889e68439eb108124175708dc1b90ef9bd0d03a317baf1aade8bfc1a35c643d7d4c8a4108da50ea8ae3a4a9aeedcf9aa482bdf1cdfcdfde18bc095fb70 diff --git a/vgrep.spec b/vgrep.spec index f964bb4..77008c5 100644 --- a/vgrep.spec +++ b/vgrep.spec @@ -1,62 +1,69 @@ -# https://github.com/vrothberg/vgrep -%global goipath github.com/vrothberg/vgrep -Version: 2.8.0 +%bcond check 1 -%gometa -f +Name: vgrep +Version: 2.8.0 +Release: %autorelease +ExclusiveArch: %{golang_arches_future} +Summary: User-friendly pager for grep +License: Apache-2.0 AND BSD-3-Clause AND GPL-3.0-only AND MIT +URL: https://github.com/vrothberg/vgrep +Source0: %{url}/archive/v%{version}/vgrep-%{version}.tar.gz +Source1: vgrep-%{version}-vendor.tar.bz2 -%global common_description %{expand: +BuildRequires: go-rpm-macros +BuildRequires: go-vendor-tools +BuildRequires: askalono-cli +BuildRequires: go-md2man + + +%description vgrep is a pager for grep, git-grep, ripgrep and similar grep implementations, and allows for opening the indexed file locations in a user-specified editor such as vim or emacs. vgrep is inspired by the ancient cgvg scripts but extended to perform further operations such as listing statistics of files and -directory trees or showing the context lines before and after the matches.} +directory trees or showing the context lines before and after the matches. -%global golicenses LICENSE -%global godocs README.md - -%bcond_without check - -Name: vgrep -Release: %autorelease -Summary: User-friendly pager for grep -License: GPL-3.0-only -URL: %{gourl} -Source: %{gosource} - -BuildRequires: go-md2man - -%description %{common_description} - -%gopkg %prep -%goprep +%autosetup -a 1 -%generate_buildrequires -%go_generate_buildrequires %build -export LDFLAGS="-X main.version=%{version} " -%gobuild -o %{gobuilddir}/bin/vgrep %{goipath} +# command +%global gomodulesmode GO111MODULE=on +export GO_LDFLAGS="-X main.version=%{version} " +%gobuild -o bin/vgrep . + +# manpage go-md2man -in docs/vgrep.1.md -out docs/vgrep.1 -%install -%gopkginstall -install -D -p -m 0755 %{gobuilddir}/bin/vgrep %{buildroot}%{_bindir}/vgrep -install -D -p -m 0644 docs/vgrep.1 %{buildroot}%{_mandir}/man1/vgrep.1 -%if %{with check} +%install +# licenses +%go_vendor_license_install + +# command +install -D -p -m 0755 -t %{buildroot}%{_bindir} bin/vgrep + +# manpage +install -D -p -m 0644 -t %{buildroot}%{_mandir}/man1 docs/vgrep.1 + + %check -%gocheck +# license validation +%go_vendor_license_check + +# upstream tests +%if %{with check} +%gocheck2 %endif -%files -%license %{golicenses} -%doc %{godocs} + +%files -f %{go_vendor_license_filelist} +%doc README.md %{_bindir}/vgrep %{_mandir}/man1/vgrep.1* -%gopkgfiles %changelog %autochangelog From 28071ef5f71d16bd6737a2decbe356ce59a5b817 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:28:02 +0000 Subject: [PATCH 22/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild