summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaltedcoffii2022-09-19 00:22:45 +0300
committersaltedcoffii2022-09-19 00:22:45 +0300
commita8e858e60dc7a7e54406540da7ecd5defd02c731 (patch)
tree664432410b027b4f29a3d39941ca86e6024d5324
parent31f791c34873ca4b57d71c67c7d58f521e87610c (diff)
downloadaur-a8e858e60dc7a7e54406540da7ecd5defd02c731.tar.gz
add gnome-software integration
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0031b4ba9d2..82538e692167 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pamac-nosnap
pkgdesc = A Gtk3 frontend from Manjaro Linux for libalpm with AUR, flatpak, and appindicator support.
pkgver = 10.4.2
- pkgrel = 2
+ pkgrel = 3
url = https://gitlab.manjaro.org/applications/pamac
install = pamac.install
arch = i686
@@ -37,6 +37,8 @@ pkgbase = pamac-nosnap
conflicts = pamac-aur-git
conflicts = pamac-flatpak
conflicts = pamac-flatpak-gnome
+ conflicts = gnome-software
+ conflicts = gnome-software-git
options = !emptydirs
source = pamac-10.4.2.tar.bz2::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.4.2/pamac-v10.4.2.tar.bz2
sha512sums = 8b5b2298e16bcfc6fbdfbf2e2cd77cb9cd769d9faa503dd8fec35c18f37b52589ffda670dc9299a8f4962f039ba870007b4601a2610ac0fc298f64a4f8e67eeb
diff --git a/PKGBUILD b/PKGBUILD
index b161d9c4e275..3c7b69555c92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=pamac
pkgname=$_pkgname-nosnap
pkgver=10.4.2
-pkgrel=2
+pkgrel=3
pkgdesc="A Gtk3 frontend from Manjaro Linux for libalpm with AUR, flatpak, and appindicator support."
arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -17,7 +17,7 @@ optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome'
'svn: use svn repositories as package sources'
'mercurial: use mercurial (hg) repositories as package sources')
makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'gobject-introspection' 'xorgproto' 'asciidoc')
-conflicts=('pamac' 'pamac-all' 'pamac-gtk' 'pamac-cli' 'pamac-common' 'pamac-aur' 'pamac-aur-git' 'pamac-flatpak' 'pamac-flatpak-gnome')
+conflicts=('pamac' 'pamac-all' 'pamac-gtk' 'pamac-cli' 'pamac-common' 'pamac-aur' 'pamac-aur-git' 'pamac-flatpak' 'pamac-flatpak-gnome' 'gnome-software' 'gnome-software-git')
provides=('pamac')
options=(!emptydirs)
install=pamac.install
@@ -40,8 +40,4 @@ check() {
package() {
meson install -C build --destdir "$pkgdir"
- # remove pamac-gnome-integration
- rm "$pkgdir/usr/bin/gnome-software"
- rm "$pkgdir/usr/share/applications/org.gnome.Software.desktop"
- rm "$pkgdir/usr/share/dbus-1/services/org.gnome.Software.service"
}