From 2f353ba9af9a2e9a56acd940d2c3b49eae688d77 Mon Sep 17 00:00:00 2001
From: David MICHENEAU <david.micheneau@orange.com>
Date: Mon, 4 Dec 2023 16:41:56 +0100
Subject: [PATCH] chore: Enhance package generation

---
 .github/workflows/generate_package.yml |  6 ------
 .goreleaser.yaml                       | 10 +++++++---
 CHANGELOG.md                           |  2 --
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/generate_package.yml b/.github/workflows/generate_package.yml
index 9965b26..fc486cd 100644
--- a/.github/workflows/generate_package.yml
+++ b/.github/workflows/generate_package.yml
@@ -12,12 +12,6 @@ jobs:
       - uses: actions/setup-go@v4.0.1 # v4.0.0
         with:
           go-version-file: 'go.mod'
-      - id: release-notes-download
-        name: Release Notes Download
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: release-notes
-          path: /tmp
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
         with:
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index be1a213..e90ff26 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -20,20 +20,24 @@ builds:
       - CGO_ENABLED=0
       # Default: [ 'darwin', 'linux', 'windows' ]
       # Default: [ '386', 'amd64', 'arm64' ]
-    binary: '{{ .ProjectName }}'
+    binary: '{{ .ProjectName }}_{{ .Version }}'
 
 universal_binaries:
   - replace: true
 
 nfpms:
-  - maintainer: Carlos A Becker <root@carlosbecker.dev>
-    description: cloudavenue-cli is a terminal app built to give a basic view to manage your Cloud Avenue IaC.
+  - file_name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Arch }}'
+    maintainer: https://github.com/orgs/orange-cloudavenue/teams
+    description: >-
+      cloudavenue-cli is a terminal app built to give a basic view to manage your Cloud Avenue IaaS.
     homepage: https://github.com/orange-cloudavenue/cloudavenue-cli
     license: MIT
     formats:
       - deb
       - rpm
       - apk
+    bindir: /usr/local/bin
+    section: default
 
 brews:
   - name: cloudavenue-cli
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b51cf84..3c929d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,6 @@
 
 ### :rocket: **New Features**
 
-* `New s3` - Add List, Create, Delete operations for s3 bucket (Object Storage). (GH-22)
-* `New vdc` - Add List, Create, Delete operations for vdc (Virtual Data Center). (GH-22)
 * `binary` - Add packaging distribution. (GH-26)
 * `edgegateway` - Add List, Create, Delete operations for edgegateway. (GH-22)
 * `publicip` - Add List, Create, Delete operations for publicip. (GH-22)