UPD source commit + PKGBUILD

4 files changed, 14 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70fa724d8f5a..5b58467e1016 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Oct 26 07:28:31 UTC 2016
+# Sun Nov 27 10:06:55 UTC 2016
 pkgbase = gdm-plymouth
 	pkgdesc = Gnome Display Manager with Plymouth support.
 	pkgver = 3.22.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gnome.org
 	arch = i686
 	arch = x86_64
@@ -15,14 +15,13 @@ pkgbase = gdm-plymouth
 	makedepends = git
 	depends = plymouth
 	depends = gnome-shell>=3.22.0
-	depends = gnome-shell<3.25.0
 	depends = gnome-session
 	depends = upower
 	depends = xorg-xrdb
 	depends = xorg-server
 	depends = xorg-server-xwayland
 	depends = xorg-xhost
-	source = git://git.gnome.org/gdm#commit=3d2aa559a4a7decc8b6568de6b41cf9f94170613
+	source = git://git.gnome.org/gdm#tag=3.22.1
 	source = 0002-Xsession-Don-t-start-ssh-agent-by-default.patch
 	sha256sums = SKIP
 	sha256sums = 63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca
@@ -32,7 +31,6 @@ pkgname = gdm-plymouth
 	groups = gnome
 	depends = plymouth
 	depends = gnome-shell>=3.22.0
-	depends = gnome-shell<3.25.0
 	depends = gnome-session
 	depends = upower
 	depends = xorg-xrdb
@@ -55,7 +53,6 @@ pkgname = gdm-plymouth
 
 pkgname = libgdm-plymouth
 	pkgdesc = GDM support library including Plymouth support
-	install = libgdm-plymouth.install
 	depends = systemd
 	depends = glib2
 	provides = libgdm
diff --git a/PKGBUILD b/PKGBUILD
index f2fa3a5dd29e..00cf2ca2fb09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Sebastian Lau <archlinux _at_ slau _dot_ info>
+# Maintainer: Sebastian Lau <lauseb644 _at_ gmail _dot_ com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Damian01w <damian01w@gmail.com>
@@ -7,16 +7,16 @@ _pkgbase=gdm
 pkgbase=gdm-plymouth
 pkgname=(gdm-plymouth libgdm-plymouth)
 pkgver=3.22.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager with Plymouth support."
 arch=(i686 x86_64)
 license=(GPL)
 url="http://www.gnome.org"
-depends=('plymouth' 'gnome-shell>=3.22.0' 'gnome-shell<3.25.0' 'gnome-session' 'upower' 'xorg-xrdb' 'xorg-server' 'xorg-server-xwayland' 'xorg-xhost')
+depends=('plymouth' 'gnome-shell>=3.22.0' 'gnome-session' 'upower' 'xorg-xrdb' 'xorg-server' 'xorg-server-xwayland' 'xorg-xhost')
 makedepends=('intltool' 'yelp-tools' 'gobject-introspection' 'git')
 checkdepends=('check')
-_commit=3d2aa559a4a7decc8b6568de6b41cf9f94170613
-source=("git://git.gnome.org/gdm#commit=$_commit"
+#_commit=4eb6575fdbd0e0dda9b209f6b4731edf990fde98   # tag=3.22.1
+source=("git://git.gnome.org/gdm#tag=$pkgver"
 	"0002-Xsession-Don-t-start-ssh-agent-by-default.patch")
 sha256sums=('SKIP'
             '63f99db7623f078e390bf755350e5793db8b2c4e06622caf42eddc63cd39ecca')
@@ -31,7 +31,6 @@ prepare() {
 
   patch -Np1 -i ../0002-Xsession-Don-t-start-ssh-agent-by-default.patch
 
-  AUTOPOINT='intltoolize --automake -c' autoreconf -fi
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -81,7 +80,6 @@ package_gdm-plymouth() {
   cd $_pkgbase
   make DESTDIR="$pkgdir" install
 
-  chmod 711 "$pkgdir/var/log/gdm"
   rm -r "$pkgdir/var/run"
 
 ### Split libgdm
@@ -94,7 +92,6 @@ package_libgdm-plymouth() {
   depends=(systemd glib2)
   provides=("libgdm")
   conflicts=("libgdm")
-  install=libgdm-plymouth.install
 
   cd $_pkgbase
   make -C libgdm DESTDIR="$pkgdir" install
diff --git a/gdm-plymouth.install b/gdm-plymouth.install
index 91f8f5cc8e69..9a18e81cf3fd 100644
--- a/gdm-plymouth.install
+++ b/gdm-plymouth.install
@@ -1,23 +1,14 @@
 post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm > /dev/null
-  chown root:gdm /var/log/gdm > /dev/null
-
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-  if (( $(vercmp $2 3.12.0) < 0 )); then
-    rm /etc/dconf/db/gdm
+  if ! getent passwd gdm >/dev/null; then
+    groupadd -g 120 gdm
+    useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+    passwd -ql gdm > /dev/null
+    chown -R gdm:gdm /var/lib/gdm > /dev/null
+    chown root:gdm /var/log/gdm > /dev/null
   fi
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-
   getent passwd gdm >/dev/null 2>&1 && userdel gdm
   getent group gdm >/dev/null 2>&1 && groupdel gdm
 }
diff --git a/libgdm-plymouth.install b/libgdm-plymouth.install
deleted file mode 100644
index 2efaad2f70f4..000000000000
--- a/libgdm-plymouth.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-