From a0ab58e9c072c8823e3af9b4fe9837c9f0fb5719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 1 Oct 2025 18:05:57 +0200 Subject: [PATCH] Update to 6.5.0 Close: rhbz#2192102 Convert to vendored guidelines --- .gitignore | 2 + apache-cloudstack-cloudmonkey.spec | 128 ++++++++--------------------- go-vendor-tools.toml | 4 + sources | 3 +- 4 files changed, 43 insertions(+), 94 deletions(-) create mode 100644 go-vendor-tools.toml diff --git a/.gitignore b/.gitignore index 9b40369..0af6a79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /cloudstack-cloudmonkey-6.1.0.tar.gz /cloudstack-cloudmonkey-6.2.0.tar.gz +/cloudstack-cloudmonkey-6.5.0-vendor.tar.bz2 +/cloudstack-cloudmonkey-6.5.0.tar.gz diff --git a/apache-cloudstack-cloudmonkey.spec b/apache-cloudstack-cloudmonkey.spec index 88320e2..891e21c 100644 --- a/apache-cloudstack-cloudmonkey.spec +++ b/apache-cloudstack-cloudmonkey.spec @@ -1,123 +1,65 @@ -# Generated by go2rpm 1.2 -%bcond_without check +# Generated by go2rpm 1.17.1 +%bcond check 1 + +# scancode has a lot of dependencies, so it can be disabled for a faster build +# or when its deps are unavailable. +%if %{defined rhel} || "%{_arch}" == "i386" +%global go_vendor_license_check_disable 1 +%endif # https://github.com/apache/cloudstack-cloudmonkey %global goipath github.com/apache/cloudstack-cloudmonkey -Version: 6.2.0 -%global tag 6.2.0 +Version: 6.5.0 +%global tag 6.5.0 -%gometa +%gometa -L -f -%global common_description %{expand: -Apache Cloudstack Cloudmonkey is a command line interface (CLI) for Apache -CloudStack. - -CloudMonkey can be use both as an interactive shell and as a command line tool -which simplifies Apache CloudStack configuration and management.} - -%global golicenses LICENSE -%global godocs README.md CHANGES.md Name: apache-cloudstack-cloudmonkey -Release: 15%{?dist} +Release: %autorelease Summary: Apache Cloudstack Cloudmonkey -# Upstream license specification: Apache-2.0 -# Automatically converted from old format: ASL 2.0 - review is highly recommended. -License: Apache-2.0 +# Generated by go-vendor-tools +License: Apache-2.0 AND BSD-3-Clause AND MIT URL: %{gourl} Source0: %{gosource} +# Generated by go-vendor-tools +Source1: %{archivename}-vendor.tar.bz2 +Source2: go-vendor-tools.toml -BuildRequires: golang(github.com/briandowns/spinner) -BuildRequires: golang(github.com/chzyer/readline) -BuildRequires: golang(github.com/gofrs/flock) -BuildRequires: golang(github.com/google/shlex) -BuildRequires: golang(github.com/mitchellh/go-homedir) -BuildRequires: golang(github.com/olekukonko/tablewriter) -BuildRequires: golang(gopkg.in/ini.v1) +BuildRequires: go-vendor-tools %description -%{common_description} - -%gopkg +Apache Cloudstack Cloudmonkey. %prep -%goprep +%goprep -A +%setup -q -T -D -a1 %{forgesetupargs} +%autopatch -p1 + +%generate_buildrequires +%go_vendor_license_buildrequires -c %{S:2} %build +%global gomodulesmode GO111MODULE=on %gobuild -o %{gobuilddir}/bin/cmk %{goipath} %install -%gopkginstall +%go_vendor_license_install -c %{S:2} install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ -%if %{with check} %check -%gocheck +%go_vendor_license_check -c %{S:2} +%if %{with check} +%gotest ./... %endif -%files -%license LICENSE -%doc README.md CHANGES.md -%{_bindir}/* +%files -f %{go_vendor_license_filelist} +%license vendor/modules.txt +%doc CHANGES.md README.md +%{_bindir}/cmk -%gopkgfiles %changelog -* Fri Aug 15 2025 Maxwell G - 6.2.0-15 -- Rebuild for golang-1.25.0 - -* Wed Jul 23 2025 Fedora Release Engineering - 6.2.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 6.2.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 24 2024 Miroslav Suchý - 6.2.0-12 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 6.2.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Feb 11 2024 Maxwell G - 6.2.0-10 -- Rebuild for golang 1.22.0 - -* Mon Jan 22 2024 Fedora Release Engineering - 6.2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 6.2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 6.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 6.2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 6.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Maxwell G - 6.2.0-4 -- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in - golang - -* Fri Jun 17 2022 Robert-André Mauchin - 6.2.0-3 -- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, - CVE-2022-29526, CVE-2022-30629 - -* Wed Jan 19 2022 Fedora Release Engineering - 6.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Sep 25 2021 Olivier Lemasle - 6.2.0-1 -- Update to upstream 6.2.0 (fixes rhbz#2007649) - -* Wed Jul 21 2021 Fedora Release Engineering - 6.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 6.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Oct 29 2020 Olivier Lemasle - 6.1.0-1 -- Initial package - +%autochangelog diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml new file mode 100644 index 0000000..6bd6f69 --- /dev/null +++ b/go-vendor-tools.toml @@ -0,0 +1,4 @@ +[archive] + +[licensing] +detector = "scancode" diff --git a/sources b/sources index 57566a1..ede9c1b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (cloudstack-cloudmonkey-6.2.0.tar.gz) = 24daace33c5d618ae109d36868801cd4e62c01fe03a721e260f370220cc4456529bbd703cbe41cc63c4838aa56c3f26d5248157ae1631ee0d0dfda46114379cf +SHA512 (cloudstack-cloudmonkey-6.5.0-vendor.tar.bz2) = 388041d511c284fdafd5234216fec6bbd86959ad7ffe56bf2b2803f91b70e75bac3fb3848a738da12b4b66af0f792477bcb50ab16d1d592235c4772b8ba17fef +SHA512 (cloudstack-cloudmonkey-6.5.0.tar.gz) = 8f88ebbab6482258591b3ad82ac05948181c2354f748dbce107f6469e39483a4966a025c059700a56dc899bcbba4c4e3aceb5e828d642230e63e2d895b15727e