diff --git a/.gitignore b/.gitignore index 7a2de98..e7267fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/vgrep-*.tar.gz -/vgrep-*-vendor.tar.bz2 +vgrep-*.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index a4f19d2..0000000 --- a/changelog +++ /dev/null @@ -1,31 +0,0 @@ -* 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/sources b/sources index e798e83..bdbe8a5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (vgrep-2.8.0.tar.gz) = 1fbd674a7fddffede70a9d0715bf09359d48abf5c238cace43996a222e3e34ec73a7911f62b8476a2dcef40485ce192476067fd99d52b7fa0e7e3fe9297f461e -SHA512 (vgrep-2.8.0-vendor.tar.bz2) = 56eb03889e68439eb108124175708dc1b90ef9bd0d03a317baf1aade8bfc1a35c643d7d4c8a4108da50ea8ae3a4a9aeedcf9aa482bdf1cdfcdfde18bc095fb70 +SHA512 (vgrep-2.5.1.tar.gz) = 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd diff --git a/vgrep.spec b/vgrep.spec index 77008c5..79008b8 100644 --- a/vgrep.spec +++ b/vgrep.spec @@ -1,69 +1,90 @@ -%bcond check 1 +# https://github.com/vrothberg/vgrep +%global goipath github.com/vrothberg/vgrep +Version: 2.5.1 -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 +%gometa -BuildRequires: go-rpm-macros -BuildRequires: go-vendor-tools -BuildRequires: askalono-cli -BuildRequires: go-md2man - - -%description +%global common_description %{expand: 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: 2%{?dist} +Summary: User-friendly pager for grep +License: GPLv3 +URL: %{gourl} +Source0: %{gosource} + +BuildRequires: golang(github.com/jessevdk/go-flags) +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: go-md2man + +%description +%{common_description} + +%gopkg %prep -%autosetup -a 1 - +%goprep %build -# command -%global gomodulesmode GO111MODULE=on -export GO_LDFLAGS="-X main.version=%{version} " -%gobuild -o bin/vgrep . - -# manpage +export LDFLAGS="-X main.version=%{version} " +%gobuild -o %{gobuilddir}/bin/vgrep %{goipath} go-md2man -in docs/vgrep.1.md -out docs/vgrep.1 - %install -# licenses -%go_vendor_license_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 -# 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 -# license validation -%go_vendor_license_check - -# upstream tests %if %{with check} -%gocheck2 +%check +%gocheck %endif - -%files -f %{go_vendor_license_filelist} -%doc README.md +%files +%license %{golicenses} +%doc %{godocs} %{_bindir}/vgrep %{_mandir}/man1/vgrep.1* +%gopkgfiles %changelog -%autochangelog +* 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