Update package to v4.1.0 and use upstream instead of a fork

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>

1 files changed, 14 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9a4962167cd0..d624caf927dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,20 +6,16 @@
 # Maintainer: Rick <rick.2889@gmail.com>
 
 pkgname=pamac-pacaur
-pkgver=3.2.1
-_pkgver=3.2.1
+pkgver=4.1.0
+_pkgver=4.1.0
 pkgrel=1
-# This is the release package so the below _gitcommit variable should (usually) be commented out.
-#_gitcommit="7266a5766441725210e7e4af3ee7da501cf0e38f"
 pkgdesc="A Gtk3 frontend for libalpm patched to work with pacaur"
 arch=('any')
-url="https://github.com/Yoshi2889/pamac"
+url="https://github.com/manjaro/pamac"
 license=('GPL3')
 depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' 'gtk3>=3.18'
-         'libnotify' 'desktop-file-utils' 'pacman>=5.0' 'gnutls>=3.4')
-optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
-            'lxsession: needed for authentification in Xfce, LXDE etc.'
-            'pacaur: needed for AUR support')
+         'libnotify' 'desktop-file-utils' 'pacman<5.1' 'gnutls>=3.4')
+optdepends=('pacaur: needed for AUR support')
 makedepends=('gettext' 'itstool' 'vala>=0.28')
 backup=('etc/pamac.conf')
 provides=('pamac')
@@ -27,35 +23,29 @@ conflicts=('pamac')
 options=(!emptydirs)
 install=pamac.install
 
-if [ "${_gitcommit}" != "" ]; then
-  source=("pamac-$pkgver-$pkgrel.tar.gz::$url/archive/$_gitcommit.tar.gz")
-else
-  source=("pamac-$pkgver.tar.gz::$url/archive/v$pkgver-patched.tar.gz")
-fi
+source=("pamac-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
 
-sha256sums=('8a25c4ce26b03b325ae6d3aa33877e461057bf13a8696425e2ef7062ba80acf4')
+sha256sums=('11378b4e3580242a24e2f3988b34f6310c65d19defeb69c096390964209fcf85')
 
 prepare() {
-  if [ "$_gitcommit" != "" ]; then
-    mv "$srcdir/pamac-$_gitcommit" "$srcdir/pamac-$pkgver"
-  fi
-
   # adjust version string
-  cd "$srcdir/pamac-$pkgver-patched/src"
-  sed -i -e "s|\"$_pkgver\"|\"$pkgver-$pkgrel\"|g" manager_window.vala
-  cd "$srcdir/pamac-$pkgver-patched/"
+  cd "$srcdir/pamac-$_pkgver"
+  sed -i -e "s|\"4.1.0\"|\"$pkgver-$pkgrel\"|g" src/transaction.vala 
   # patches here
+  sed -i -e "s/yaourt/pacaur/g" src/transaction.vala
+  sed -i -e "s/yaourt/pacaur/g" src/preferences_dialog.vala
+  sed -i -e "s/yaourt/pacaur/g" src/manager_window.vala
 }
 
 build() {
-  cd "$srcdir/pamac-$pkgver-patched"
+  cd "$srcdir/pamac-$pkgver"
 
   # build
   make all
 }
 
 package() {
-  cd "$srcdir/pamac-$pkgver-patched"
+  cd "$srcdir/pamac-$pkgver"
   make prefix="$pkgdir"/usr sysconfdir="$pkgdir"/etc install
 }