gnome fos fix

4 files changed, 21 insertions, 8 deletions

diff --git a/gnome-raveos/gnome-keyring/PKGBUILD b/gnome-raveos/gnome-keyring/PKGBUILD
index 4e17c9a..d68c9cf 100644
--- a/gnome-raveos/gnome-keyring/PKGBUILD
+++ b/gnome-raveos/gnome-keyring/PKGBUILD
@@ -10,10 +10,6 @@ options=(!strip)
 install=gnome-keyring.install
 source=("gnome-keyring.pkg.tar.zst::https://archive.archlinux.org/packages/g/gnome-keyring/gnome-keyring-1:50.0-1-x86_64.pkg.tar.zst")
 sha256sums=('96c5f9dfd143103781ba78be1ee28e3a756e454adeb8a1a097ac34f7f5faed08')
-prepare() {
-  bsdtar -xf "$srcdir/gnome-keyring.pkg.tar.zst" -C "$srcdir" .INSTALL
-  mv -f "$srcdir/.INSTALL" "$srcdir/gnome-keyring.install"
-}
 package() {
   bsdtar -xf "$srcdir/gnome-keyring.pkg.tar.zst" -C "$pkgdir" --exclude .PKGINFO --exclude .BUILDINFO --exclude .MTREE --exclude .INSTALL
 }
diff --git a/gnome-raveos/gnome-keyring/gnome-keyring.install b/gnome-raveos/gnome-keyring/gnome-keyring.install
new file mode 100644
index 0000000..6143dd1
--- /dev/null
+++ b/gnome-raveos/gnome-keyring/gnome-keyring.install
@@ -0,0 +1,14 @@
+post_install() {
+  # Enable socket by default
+  systemctl --global enable gnome-keyring-daemon.socket
+}
+
+post_upgrade() {
+  if (( $(vercmp $2 1:42.0-1) < 0)); then
+    systemctl --global enable gnome-keyring-daemon.socket
+  fi
+}
+
+pre_remove() {
+  systemctl --global disable gnome-keyring-daemon.socket
+}
diff --git a/gnome-raveos/gvfs-nfs/PKGBUILD b/gnome-raveos/gvfs-nfs/PKGBUILD
index 1787aeb..548d39c 100644
--- a/gnome-raveos/gvfs-nfs/PKGBUILD
+++ b/gnome-raveos/gvfs-nfs/PKGBUILD
@@ -10,10 +10,6 @@ options=(!strip)
 install=gvfs-nfs.install
 source=("gvfs-nfs.pkg.tar.zst::https://archive.archlinux.org/packages/g/gvfs-nfs/gvfs-nfs-1.60.3-3-x86_64.pkg.tar.zst")
 sha256sums=('7cc0f563aacb806a1ad34b2814036c9de0e968b439674ae28e2395cb47e0767d')
-prepare() {
-  bsdtar -xf "$srcdir/gvfs-nfs.pkg.tar.zst" -C "$srcdir" .INSTALL
-  mv -f "$srcdir/.INSTALL" "$srcdir/gvfs-nfs.install"
-}
 package() {
   bsdtar -xf "$srcdir/gvfs-nfs.pkg.tar.zst" -C "$pkgdir" --exclude .PKGINFO --exclude .BUILDINFO --exclude .MTREE --exclude .INSTALL
 }
diff --git a/gnome-raveos/gvfs-nfs/gvfs-nfs.install b/gnome-raveos/gvfs-nfs/gvfs-nfs.install
new file mode 100644
index 0000000..4d92e50
--- /dev/null
+++ b/gnome-raveos/gvfs-nfs/gvfs-nfs.install
@@ -0,0 +1,7 @@
+post_install() {
+  setcap 'cap_net_bind_service=+ep' usr/lib/gvfsd-nfs
+}
+
+post_upgrade() {
+  post_install
+}