upgpkg: rlr-git r64.7bed0f3-1

2 files changed, 23 insertions, 22 deletions

diff --git a/rlr-git/.SRCINFO b/rlr-git/.SRCINFO
index 5d8ee9e..cc77a71 100644
--- a/rlr-git/.SRCINFO
+++ b/rlr-git/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = rlr-git
         pkgdesc = interactive pixel screen ruler and protractor
-        pkgver = r31.463c617
+        pkgver = r64.7bed0f3
         pkgrel = 1
         url = https://github.com/epilys/rlr
         arch = any
-        license = GPL
+        license = GPL-3.0-or-later
         makedepends = git
         makedepends = cargo
         provides = rlr
diff --git a/rlr-git/PKGBUILD b/rlr-git/PKGBUILD
index 4ec3d19..1c9da2d 100644
--- a/rlr-git/PKGBUILD
+++ b/rlr-git/PKGBUILD
@@ -1,12 +1,14 @@
 # Maintainer: Yigit Sever <yigit at yigitsever dot com>
+# Contributor: Paulo Fino <[email protected]>
 
 pkgname=rlr-git
-pkgver=r31.463c617
+_pkgnamefull=com.github.epilys.rlr
+pkgver=r64.7bed0f3
 pkgrel=1
 pkgdesc="interactive pixel screen ruler and protractor"
 arch=('any')
 url="https://github.com/epilys/rlr"
-license=('GPL')
+license=('GPL-3.0-or-later')
 makedepends=('git' 'cargo')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
@@ -14,32 +16,31 @@ source=("${pkgname%-git}::git+${url}")
 sha256sums=('SKIP')
 
 pkgver() {
-        cd "$srcdir/${pkgname%-git}"
-        # git, no tags available
-        printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir/${pkgname%-git}"
+  # git, no tags available
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-        cd "$srcdir/${pkgname%-git}"
-        cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  cd "$srcdir/${pkgname%-git}"
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-        cd "$srcdir/${pkgname%-git}"
-        export RUSTUP_TOOLCHAIN=stable
-        export CARGO_TARGET_DIR=target
-        cargo build --frozen --release --all-features
+  cd "$srcdir/${pkgname%-git}"
+  export RUSTUP_TOOLCHAIN=stable
+  export CARGO_TARGET_DIR=target
+  cargo build --frozen --release --all-features
 }
 
 package() {
-        # binary
-        install -Dm0755 "${srcdir}/${pkgname%-git}/target/release/${pkgname%-git}" -t "${pkgdir}/usr/bin/"
-        # desktop file
-        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-git}.desktop"
-
-        # icon
-        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname%-git}.svg"
-        # symbolic icon
-        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}-symbolic.svg" "${pkgdir}/usr/share/icons/hicolor/symbolic/apps/${pkgname%-git}-symbolic.svg"
+  # binary
+  install -Dm0755 "${srcdir}/${pkgname%-git}/target/release/${pkgname%-git}" -t "${pkgdir}/usr/bin/"
+  # desktop file
+  install -Dm644 "${srcdir}/${pkgname%-git}/data/${_pkgnamefull%}.desktop" "${pkgdir}/usr/share/applications/${_pkgnamefull%}.desktop"
 
+  # icon
+  install -Dm644 "${srcdir}/${pkgname%-git}/data/${_pkgnamefull%}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgnamefull%}.svg"
+  # symbolic icon
+  install -Dm644 "${srcdir}/${pkgname%-git}/data/${_pkgnamefull%}-symbolic.svg" "${pkgdir}/usr/share/icons/hicolor/symbolic/apps/${_pkgnamefull%}-symbolic.svg"
 }