Fix License

2 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c271c4f443b7..3685d513664c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = rancher-desktop
 	pkgdesc = Rancher Desktop is an open-source project to bring Kubernetes and container management to the desktop
 	pkgver = 0.6.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://rancherdesktop.io/
 	arch = x86_64
-	license = MIT
+	license = Apache
 	makedepends = npm
 	makedepends = nodejs
 	makedepends = git
@@ -12,6 +12,13 @@ pkgbase = rancher-desktop
 	optdepends = kubectl: Kubernetes control, can be downloaded from settings
 	optdepends = nerdctl-bin: Docker-compatible CLI for containerd
 	optdepends = helm: for Apps section, only useful if your deploy uses helm or plan to use it
+	provides = rancher-desktop
+	provides = docker
+	provides = helm
+	provides = kim
+	provides = kubectl
+	provides = nerdctl
+	conflicts = rancher-desktop-git
 	source = rancher-desktop-0.6.1::git+https://github.com/rancher-sandbox/rancher-desktop.git#branch=main
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 3370191bcfce..b3ad97e3327a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,22 @@
 # Maintainer: Dominic Giebert <dominic.giebert@gmail.com>
-# Contributor: auroq <johansen.parker@gmail.com>
+# Contributor: Parker Johansen <johansen.parker@gmail.com>
 
 pkgname=rancher-desktop
 pkgdesc='Rancher Desktop is an open-source project to bring Kubernetes and container management to the desktop'
 pkgver=0.6.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
-license=('MIT')
+license=('Apache')
 url='https://rancherdesktop.io/'
 makedepends=('npm' 'nodejs' 'git' )
 optdepends=('kubectl: Kubernetes control, can be downloaded from settings'
             'nerdctl-bin: Docker-compatible CLI for containerd'
             'helm: for Apps section, only useful if your deploy uses helm or plan to use it')
+provides=('rancher-desktop' 'docker' 'helm' 'kim' 'kubectl' 'nerdctl')
 depends=('qemu')
 source=("${pkgname}-${pkgver}::git+https://github.com/rancher-sandbox/rancher-desktop.git#branch=main")
 sha256sums=('SKIP')
+conflicts=('rancher-desktop-git')
 
 build() {
   cd "${pkgname}-${pkgver}"
@@ -28,11 +30,10 @@ build() {
   # Remove Flatpak and appimage as they are not needed
   rm packaging/linux/appimage.yml
   rm packaging/linux/flatpak.yaml
+
   # https://github.com/rancher-sandbox/rancher-desktop#how-to-run
   npm install
   npm run build
-
-
 }
 
 package() {
@@ -43,15 +44,14 @@ package() {
   install -d "$pkgdir/usr/share/icons/hicolor/"
   cp -r dist/linux-unpacked/* "$pkgdir/opt/${pkgname}/"
   cp -r share/icons/hicolor/* "$pkgdir/usr/share/icons/hicolor/"
+  install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 
   # Add integration for desktop env
-  install -d "$pkgdir/usr/share/applications/"
-  install -d "$pkgdir/usr/share/metainfo"
-  cp -r packaging/linux/rancher-desktop.desktop "$pkgdir/usr/share/applications/rancher-desktop.desktop"
-  cp -r packaging/linux/rancher-desktop.appdata.xml "$pkgdir/usr/share/metainfo/rancher-desktop.appdata.xml"
+  install -Dm644 packaging/linux/rancher-desktop.desktop -t "$pkgdir/usr/share/applications"
+  install -Dm644 packaging/linux/rancher-desktop.appdata.xml -t "$pkgdir/usr/share/metainfo"
 
   # Creating the symlink for better usage
   install -d "$pkgdir"/usr/bin/
-  ln -sf /opt/${pkgname}/rancher-desktop ${pkgdir}/usr/bin/rancher-desktop
+  ln -sf /opt/${pkgname}/${pkgname} ${pkgdir}/usr/bin/${pkgname}
 }