diff --git a/.gitignore b/.gitignore index a474b5f..d2506d8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,32 +4,4 @@ /vultr-cli-2.12.0.tar.gz /vultr-cli-2.12.1.tar.gz /vultr-cli-2.12.2.tar.gz -/vultr-cli-2.14.0.tar.gz /vultr-cli-2.14.2.tar.gz -/vultr-cli-2.15.0.tar.gz -/vultr-cli-2.15.1.tar.gz -/vultr-cli-2.16.2.tar.gz -/vultr-cli-2.17.0.tar.gz -/vultr-cli-2.18.0.tar.gz -/vultr-cli-2.18.2.tar.gz -/vultr-cli-2.19.0.tar.gz -/vultr-cli-2.20.0.tar.gz -/vultr-cli-2.21.0.tar.gz -/vultr-cli-2.22.0.tar.gz -/vultr-cli-3.0.0.tar.gz -/vultr-cli-3.0.3.tar.gz -/vultr-cli-3.1.0.tar.gz -/vultr-cli-3.2.0.tar.gz -/vultr-cli-3.3.0.tar.gz -/vultr-cli-3.3.1.tar.gz -/vultr-cli-3.4.0.tar.gz -/vultr-cli-3.5.0.tar.gz -/vultr-cli-3.5.0-vendor.tar.bz2 -/vultr-cli-3.6.0.tar.gz -/vultr-cli-3.6.0-vendor.tar.bz2 -/vultr-cli-3.7.0.tar.gz -/vultr-cli-3.7.0-vendor.tar.bz2 -/vultr-cli-3.8.0.tar.gz -/vultr-cli-3.8.0-vendor.tar.bz2 -/vultr-cli-3.9.2.tar.gz -/vultr-cli-3.9.2-vendor.tar.bz2 diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index acacae8..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,35 +0,0 @@ -upstream_package_name: vultr-cli -downstream_package_name: vultr-cli - -upstream_project_url: https://github.com/vultr/vultr-cli -upstream_tag_template: v{version} - -specfile_path: vultr-cli.spec - -jobs: - -- job: pull_from_upstream - trigger: release - dist_git_branches: - - rawhide - -- job: koji_build - trigger: commit - dist_git_branches: - - rawhide - -actions: - post-modifications: - # https://fedora.gitlab.io/sigs/go/go-vendor-tools/scenarios/#manual-update - - | - sh -xeuc " - cd $PACKIT_DOWNSTREAM_REPO - export GOTOOLCHAIN=auto - go_vendor_archive create --config go-vendor-tools.toml vultr-cli.spec - go_vendor_license \ - --config go-vendor-tools.toml \ - --path vultr-cli.spec \ - report \ - --verify-spec - " -create_sync_note: false diff --git a/README.packit b/README.packit deleted file mode 100644 index fb341a1..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml deleted file mode 100644 index cb161dd..0000000 --- a/go-vendor-tools.toml +++ /dev/null @@ -1,13 +0,0 @@ -[archive] - -[licensing] -detector = "askalono" -[[licensing.licenses]] -path = "vendor/go.yaml.in/yaml/v3/LICENSE" -sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b" -expression = "MIT AND (MIT AND Apache-2.0)" - -[[licensing.licenses]] -path = "vendor/gopkg.in/yaml.v3/LICENSE" -sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b" -expression = "MIT AND (MIT AND Apache-2.0)" diff --git a/sources b/sources index 3011cd4..e1a3ebc 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (vultr-cli-3.9.2.tar.gz) = 6247c4fe303601d81704b1a7a2f3a0cc919e6b7d4fc2fd5a9f83badd8d5bd5f9a2663b1a9c998e0f7fdeb019757248e2bdd41a70b49dfd211fd48f5983df77ee -SHA512 (vultr-cli-3.9.2-vendor.tar.bz2) = 95119651e360d56bdaf4be01fcc5c4b9fce4ccff233cc3093f4112da7602787e3d48aa5ea49d7cecc3ee102ec51e86ebc2b86d040c0a2a0363499c56c57ae823 +SHA512 (vultr-cli-2.14.2.tar.gz) = b9838b36def875dd664351d4c47efa37da2747ac2600d98a7cadec447a4779d684f8984ec7bc8633d30296989cfc98596c0aad183e6fba1b5d763b16b5174d9d diff --git a/vultr-cli.spec b/vultr-cli.spec index b8a622b..dfc1dbd 100644 --- a/vultr-cli.spec +++ b/vultr-cli.spec @@ -1,42 +1,39 @@ -# Generated by go2rpm 1.17.1 -%bcond check 1 +%bcond_without check # https://github.com/vultr/vultr-cli -%global goipath github.com/vultr/vultr-cli/v3 -Version: 3.9.2 +%global goipath github.com/vultr/vultr-cli +Version: 2.14.2 -%gometa -L -f +%gometa +%global common_description %{expand: +Official command line tool for Vultr services.} + +%global golicenses LICENSE +%global godocs CHANGELOG.md CONTRIBUTING.md README.md Name: vultr-cli Release: %autorelease Summary: Official command line tool for Vultr services - -# Generated by go-vendor-tools -License: Apache-2.0 AND BSD-3-Clause AND MIT AND MPL-2.0 +# Upstream license specification: Apache-2.0 +License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -# Generated by go-vendor-tools -Source1: %{archivename}-vendor.tar.bz2 -Source2: go-vendor-tools.toml -BuildRequires: go-vendor-tools - -ExcludeArch: ppc64le s390x +BuildRequires: go-rpm-macros %description -Official command line tool for Vultr services. +%{common_description} + +%gopkg %prep -%goprep -A -%setup -q -T -D -a1 %{forgesetupargs} -%autopatch -p1 +%goprep %generate_buildrequires -%go_vendor_license_buildrequires -c %{S:2} +%go_generate_buildrequires %build -%global gomodulesmode GO111MODULE=on %gobuild -o %{gobuilddir}/bin/vultr-cli %{goipath} # Build shell completions. @@ -44,30 +41,39 @@ for SHELL in bash fish zsh; do VULTR_API_KEY=null %{gobuilddir}/bin/%{name} completion $SHELL > %{name}.${SHELL} done + %install -%go_vendor_license_install -c %{S:2} +%gopkginstall install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ # Install shell completions. -install -Dp %{name}.bash %{buildroot}%{bash_completions_dir}/%{name} -install -Dp %{name}.fish %{buildroot}%{fish_completions_dir}/%{name}.fish -install -Dp %{name}.zsh %{buildroot}%{zsh_completions_dir}/_%{name} +install -Dp %{name}.bash %{buildroot}%{_datadir}/bash-completion/completions/%{name} +install -Dp %{name}.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/%{name}.fish +install -Dp %{name}.zsh %{buildroot}%{_datadir}/zsh/site-functions/_%{name} + -%check -%go_vendor_license_check -c %{S:2} %if %{with check} -%gotest ./... +%check +%gocheck %endif -%files -f %{go_vendor_license_filelist} -%license vendor/modules.txt -%doc CHANGELOG.md CONTRIBUTING.md README.md -%{_bindir}/vultr-cli -%{bash_completions_dir}/%{name} -%{fish_completions_dir}/%{name}.fish -%{zsh_completions_dir}/_%{name} +%files +%license %{golicenses} +%doc %{godocs} +%{_bindir}/* +%{_datadir}/bash-completion/completions/%{name} +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/fish/vendor_completions.d/%{name}.fish +%dir %{_datadir}/fish +%dir %{_datadir}/fish/vendor_completions.d +%{_datadir}/zsh/site-functions/_%{name} +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions + +%gopkgfiles %changelog %autochangelog