V7.1rc3

2 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20cead20dd32..5bd344592134 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pamac-aur
 	pkgdesc = A Gtk3 frontend for libalpm
-	pkgver = 7.0.1
+	pkgver = 7.1.0rc3
 	pkgrel = 1
 	url = https://gitlab.manjaro.org/applications/pamac
 	install = pamac.install
@@ -38,8 +38,8 @@ pkgbase = pamac-aur
 	conflicts = pamac
 	options = !emptydirs
 	backup = etc/pamac.conf
-	source = pamac-7.0.1-1.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/v7.0.1/pamac-v7.0.1.tar.gz
-	sha256sums = 148a5aa309363841773a752e4584e9588967f344a7dbd30e1b06116cc2aa08fa
+	source = pamac-7.1.0rc3-1.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/250cad77f395b9521c0560edd39328ee99095456/pamac-aur-250cad77f395b9521c0560edd39328ee99095456.tar.gz
+	sha256sums = 7e40ed9c19980fbdc3a3496a56c55999f3d877c798986d39710a9454e9b5c9be
 
 pkgname = pamac-aur
 
diff --git a/PKGBUILD b/PKGBUILD
index 808ea350adca..276bba9953de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,10 @@
 # Maintainer: Zeph <zeph33@gmail.com>
 pkgname=pamac-aur
 _pkgver=7.0.1
-pkgver=$_pkgver
+pkgver=7.1.0rc3
+#pkgver=$_pkgver
 pkgrel=1
+_commit=250cad77f395b9521c0560edd39328ee99095456
 pkgdesc="A Gtk3 frontend for libalpm"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://gitlab.manjaro.org/applications/pamac"
@@ -22,20 +24,23 @@ provides=('pamac')
 options=(!emptydirs)
 install=pamac.install
 
-source=("pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/v$_pkgver/pamac-v$_pkgver.tar.gz")
-sha256sums=('148a5aa309363841773a752e4584e9588967f344a7dbd30e1b06116cc2aa08fa')
+source=(#"pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/v$_pkgver/$pkgname-v$_pkgver.tar.gz")
+        "pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz")
+
+sha256sums=('7e40ed9c19980fbdc3a3496a56c55999f3d877c798986d39710a9454e9b5c9be')
 
 prepare() {
-  cd "$srcdir/pamac-v$pkgver"
+  mv "$srcdir/pamac-$_commit" "$srcdir/pamac-v$_pkgver"
+  cd "$srcdir/pamac-v$_pkgver"
   # patches here
   #patch -p1 -i "$srcdir/git-$pkgver-$pkgrel.patch"
 
   # adjust version string
-  sed -i -e "s|\"$_pkgver\"|\"$pkgver-$pkgrel\"|g" src/manager_window.vala
+  sed -i -e "s|\"$_pkgver\"|\"$pkgver-$pkgrel\"|g" src/version.vala
 }
 
 build() {
-  cd "$srcdir/pamac-v$pkgver"
+  cd "$srcdir/pamac-v$_pkgver"
   mkdir -p builddir
   cd builddir
   meson --prefix=/usr --sysconfdir=/etc
@@ -45,7 +50,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/pamac-v$pkgver/builddir"
+  cd "$srcdir/pamac-v$_pkgver/builddir"
   
   DESTDIR="$pkgdir" ninja install
   # remove pamac-tray-appindicator