Move install file to libpamac-full and remove conflict with pamac-cli.

3 files changed, 14 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a73b26561d44..29ec4d44a508 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = pamac-all
 	pkgdesc = A Gtk3 frontend for libalpm (everything in one package - snap, flatpak, appindicator)
 	pkgver = 11.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.manjaro.org/applications/pamac
-	install = pamac.install
 	arch = i686
 	arch = x86_64
 	arch = arm
@@ -21,17 +20,16 @@ pkgbase = pamac-all
 	depends = libhandy
 	depends = libadwaita
 	optdepends = polkit-gnome: needed for authentification in Cinnamon, Gnome
-	provides = pamac=11.0.1-1
+	provides = pamac=11.0.1-2
 	conflicts = pamac
 	conflicts = pamac-gtk
-	conflicts = pamac-cli
 	conflicts = pamac-common
 	conflicts = pamac-aur
 	conflicts = pamac-aur-git
 	conflicts = pamac-flatpak
 	conflicts = pamac-flatpak-gnome
 	options = !emptydirs
-	source = pamac-11.0.1.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/11.0.1/pamac-11.0.1.tar.gz
+	source = https://gitlab.manjaro.org/applications/pamac/-/archive/11.0.1/pamac-11.0.1.tar.gz
 	sha256sums = f80cc219915a8a86b685461c1ed9182fafcb84b9f72f1f4d128fadce8122eda7
 
 pkgname = pamac-all
diff --git a/PKGBUILD b/PKGBUILD
index cd23e998bcf2..6691b9c4c40a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,38 @@
 # Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
 # Contributor: Zeph <zeph33@gmail.com>
 # Contributor: LSUtigers3131
-# https://gitlab.manjaro.org/packages/extra/pamac
 
 _pkgname=pamac
 pkgname=${_pkgname}-all
 pkgver=11.0.1
-pkgrel=1
-_pkgfixver=$pkgver
-
+pkgrel=2
 pkgdesc="A Gtk3 frontend for libalpm (everything in one package - snap, flatpak, appindicator)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://gitlab.manjaro.org/applications/pamac"
+url="https://gitlab.manjaro.org/applications/$_pkgname"
 license=('GPL3')
 depends=('libnotify' 'libpamac-full' 'libhandy' 'libadwaita')
 optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome')
 makedepends=('gettext' 'vala' 'meson' 'ninja' 'gobject-introspection')
-conflicts=('pamac' 'pamac-gtk' 'pamac-cli' 'pamac-common' 'pamac-aur' 'pamac-aur-git' 'pamac-flatpak' 'pamac-flatpak-gnome')
+conflicts=('pamac' 'pamac-gtk' 'pamac-common' 'pamac-aur' 'pamac-aur-git' 'pamac-flatpak' 'pamac-flatpak-gnome')
 provides=("pamac=$pkgver-$pkgrel")
 options=(!emptydirs)
-install='pamac.install'
-source=("pamac-$pkgver.tar.gz::$url/-/archive/$pkgver/pamac-$pkgver.tar.gz") 
+source=("$url/-/archive/$pkgver/pamac-$pkgver.tar.gz")
 sha256sums=('f80cc219915a8a86b685461c1ed9182fafcb84b9f72f1f4d128fadce8122eda7')
 
 _srcdir="$_pkgname-$pkgver"
 
 prepare() {
-  cd "$_srcdir"
-  # adjust version string
-  sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" 'src/version.vala'
+	cd "$_srcdir"
+	# adjust version string
+	sed -i -e "s|\"$pkgver\"|\"$pkgver-$pkgrel\"|g" 'src/version.vala'
 }
 
 build() {
-  arch-meson "$_srcdir" 'build' -Denable-fake-gnome-software=false
-  meson compile -C 'build'
+	arch-meson "$_srcdir" 'build' -Denable-fake-gnome-software=false
+	meson compile -C 'build'
 }
 
 package() {
-  meson install -C 'build' --destdir "$pkgdir"
-  install -Dm644 "$_srcdir/COPYING" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+	meson install -C 'build' --destdir "$pkgdir"
+	install -Dm644 "$_srcdir/COPYING" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-# vim:set ts=2 sw=2 et:
diff --git a/pamac.install b/pamac.install
deleted file mode 100644
index f3e89676fd66..000000000000
--- a/pamac.install
+++ /dev/null
@@ -1,39 +0,0 @@
-post_install() {
-   # enable flatpak repo
-  if [ -f /usr/bin/flatpak ]; then
-    flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  fi   
- # enable classic snap support
-  if [ -f /usr/bin/snap ]; then
- #   ln -s /var/lib/snapd/snap /snap
-    systemctl enable snapd.socket
-  fi
-  # enable systemd timers
-  ln -sf /usr/lib/systemd/system/pamac-cleancache.timer /etc/systemd/system/multi-user.target.wants
-  #ln -sf /usr/lib/systemd/system/pamac-mirrorlist.timer /etc/systemd/system/multi-user.target.wants
-  # polkit agent
-  printf '==> An authentication agent is required\n'
-  printf '    Cinnamon, Deepin, GNOME, GNOME Flashback, KDE, LXDE, LXQt, MATE and Xfce\n'
-  printf '    have an authentication agent already.\n'
-  printf '    See https://wiki.archlinux.org/index.php/Polkit#Authentication_agents\n'
-  printf '    for other desktop environments.\n'
-}
-
-post_upgrade() {
-   # enable flatpak repo
-  if [ -f /usr/bin/flatpak ]; then
-    flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  fi  
- # enable classic snap support
-  if [ -f /usr/bin/snap ]; then
- #   ln -s /var/lib/snapd/snap /snap
-    systemctl is-active snapd.socket >/dev/null || systemctl enable snapd.socket
-  fi
-
-}
-
-post_remove() {
-  # disable systemd timers
-  rm -f /etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer
-  #rm -f /etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer
-}