upgpkg: git-credential-manager-core 2.0.931-1

- Version bump.
- Use tarball for build.
- Improve dependencies definitions.
- General PKGBUILD improvements.

2 files changed, 39 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a131874c60ab..7fc164167f71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = git-credential-manager-core
 	pkgdesc = A secure Git credential helper built on .NET that runs on Windows, macOS, and Linux
-	pkgver = 2.0.886
+	pkgver = 2.0.931
 	pkgrel = 1
 	url = https://github.com/GitCredentialManager/git-credential-manager
 	install = git-credential-manager-core.install
@@ -8,25 +8,28 @@ pkgbase = git-credential-manager-core
 	arch = x86_64
 	license = MIT
 	checkdepends = dotnet-runtime-6.0
-	makedepends = git
 	makedepends = dotnet-sdk
 	makedepends = dpkg
-	provides = git-credential-manager-core
-	conflicts = git-credential-manager-core-bin
-	replaces = git-credential-manager
+	makedepends = fontconfig
+	makedepends = krb5
+	makedepends = zlib
 	options = !strip
-	source = git-credential-manager-core::git+https://github.com/GitCredentialManager/git-credential-manager.git#tag=v2.0.886
+	source = git-credential-manager-core-2.0.931.tar.gz::https://github.com/GitCredentialManager/git-credential-manager/archive/refs/tags/v2.0.931.tar.gz
 	source = trim-executables.diff
-	sha256sums = SKIP
-	sha256sums = 3eb41718ef9c701307a6ca7ef85b6993d93fe55b5ad4fad632ff5722779397cf
+	sha512sums = 24c043e39f6f7e7ea7081667b3e2ea7eced1ffcd84e140d0baf184fd208d6ae4f4de4ea172ce694a10082073d2f025e92504d4bb3ffb788b79732063d9c2bfc9
+	sha512sums = e5253397233ef8aee547402c4c1e2430ed8bf87346896d7052ce5ef4967fb705431b3516d53c1508aee9eb1fbe3204500c614be04fe2af326851a8a7d2fefd6d
 
 pkgname = git-credential-manager-core
 	depends = zlib
 	depends = krb5
 	optdepends = git-credential-manager-core-extras: additional QT UIs for logging in
+	provides = git-credential-manager-core
+	conflicts = git-credential-manager-core-bin
+	replaces = git-credential-manager
 
 pkgname = git-credential-manager-core-extras
 	pkgdesc = Additional login UIs to Github and Bitbucket for Git Credential Manager Core
 	depends = zlib
 	depends = krb5
 	depends = fontconfig
+	depends = git-credential-manager-core
diff --git a/PKGBUILD b/PKGBUILD
index 987f4ec9e22c..5795c510abc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,22 @@
 # Maintainer: Giovanni Santini <giovannisantini93@yahoo.it>
 pkgbase=git-credential-manager-core
-pkgname=(
-    "$pkgbase"
-    "${pkgbase}-extras"
-)
-pkgver=2.0.886
+_pkgbase="${pkgbase/-core/}"
+pkgname=("$pkgbase"
+         "${pkgbase}-extras")
+pkgver=2.0.931
 pkgrel=1
 pkgdesc="A secure Git credential helper built on .NET that runs on Windows, macOS, and Linux"
 arch=(i686 x86_64)
 url="https://github.com/GitCredentialManager/git-credential-manager"
 license=('MIT')
-makedepends=(git dotnet-sdk dpkg)
+makedepends=(dotnet-sdk dpkg fontconfig krb5 zlib)
 checkdepends=(dotnet-runtime-6.0)
-provides=($pkgname)
-conflicts=("${pkgname}-bin")
-replaces=(git-credential-manager)
 options=(!strip)
-install=$pkgname.install
-source=("$pkgbase::git+$url.git#tag=v$pkgver"
+install="$pkgname.install"
+source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
         "trim-executables.diff")
-sha256sums=('SKIP'
-            '3eb41718ef9c701307a6ca7ef85b6993d93fe55b5ad4fad632ff5722779397cf')
+sha512sums=('24c043e39f6f7e7ea7081667b3e2ea7eced1ffcd84e140d0baf184fd208d6ae4f4de4ea172ce694a10082073d2f025e92504d4bb3ffb788b79732063d9c2bfc9'
+            'e5253397233ef8aee547402c4c1e2430ed8bf87346896d7052ce5ef4967fb705431b3516d53c1508aee9eb1fbe3204500c614be04fe2af326851a8a7d2fefd6d')
 
 # Seems that trimming is not required, either because of newer .NET or project changes
 # Feel free to uncomment these lines if needed
@@ -33,55 +29,58 @@ sha256sums=('SKIP'
 #}
 
 build() {
-    cd "$pkgbase"
+    cd "${_pkgbase}-${pkgver}"
     dotnet build --configuration LinuxRelease
 }
 
 check() {
-    cd "$pkgbase"
+    cd "${_pkgbase}-${pkgver}"
     dotnet test --configuration LinuxRelease
 }
 
 package_git-credential-manager-core() {
+    provides=($pkgname)
+    conflicts=("${pkgname}-bin")
+    replaces=(git-credential-manager)
     depends+=(zlib krb5)
     optdepends=('git-credential-manager-core-extras: additional QT UIs for logging in')
 
-    cd "$pkgbase"
-    mkdir -p "$pkgdir/usr/bin"
-    mkdir -p "$pkgdir/usr/lib/share/$pkgname"
-    mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
+    cd "${_pkgbase}-${pkgver}"
+    mkdir -pv "$pkgdir/usr/bin"
+    mkdir -pv "$pkgdir/usr/lib/share/$pkgname"
+    mkdir -pv "$pkgdir/usr/share/licenses/$pkgname"
     
     for bin in git-credential-manager
     do
-        cp "out/linux/Packaging.Linux/Release/payload/$bin" "$pkgdir/usr/lib/share/$pkgname"
-        ln -s "/usr/lib/share/$pkgname/$bin" "$pkgdir/usr/bin/$bin"
+        cp -v  "out/linux/Packaging.Linux/Release/payload/$bin" "$pkgdir/usr/lib/share/$pkgname"
+        ln -sv "/usr/lib/share/$pkgname/$bin" "$pkgdir/usr/bin/$bin"
     done
     # Deal with the different naming convention
     # https://github.com/GitCredentialManager/git-credential-manager/pull/551
     # https://github.com/GitCredentialManager/git-credential-manager/blob/main/docs/rename.md
     ln -s "/usr/lib/share/$pkgname/git-credential-manager" "$pkgdir/usr/bin/$pkgname"
 
-    cp LICENSE "$pkgdir/usr/share/licenses/$pkgname"
+    cp -v LICENSE "$pkgdir/usr/share/licenses/$pkgname"
 }
 
 package_git-credential-manager-core-extras() {
     pkgdesc="Additional login UIs to Github and Bitbucket for Git Credential Manager Core"
-    depends+=(zlib krb5 fontconfig)
+    depends+=(zlib krb5 fontconfig "$pkgbase")
 
-    cd "$pkgbase"
+    cd "${_pkgbase}-${pkgver}"
 
-    mkdir -p "$pkgdir/usr/lib/share/$pkgbase"
-    mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
+    mkdir -pv "$pkgdir/usr/lib/share/$pkgbase"
+    mkdir -pv "$pkgdir/usr/share/licenses/$pkgname"
 
     for lib in libHarfBuzzSharp.so libSkiaSharp.so
     do
-        cp "out/linux/Packaging.Linux/Release/payload/$lib" "$pkgdir/usr/lib/share/$pkgbase"
+        cp -v "out/linux/Packaging.Linux/Release/payload/$lib" "$pkgdir/usr/lib/share/$pkgbase"
     done
 
     for bin in GitHub.UI Atlassian.Bitbucket.UI
     do
-        cp "out/linux/Packaging.Linux/Release/payload/$bin" "$pkgdir/usr/lib/share/$pkgbase"
+        cp -v "out/linux/Packaging.Linux/Release/payload/$bin" "$pkgdir/usr/lib/share/$pkgbase"
     done
 
-    cp LICENSE "$pkgdir/usr/share/licenses/$pkgname"
+    cp -v LICENSE "$pkgdir/usr/share/licenses/$pkgname"
 }