2.0.10-1

1 files changed, 59 insertions, 57 deletions

diff --git a/PKGBUILD b/PKGBUILD
index cfd8819221fc..32513ffdd99c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
-# Maintainer: Piotr Gorski <lucjan.lucjanov@gmail.com>
+# Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
+# Contributor: Piotr Gorski <lucjan.lucjanov@gmail.com>
 
 pkgname=mdm-nosystemd
 _pkgname=mdm
-pkgver=2.0.7
+pkgver=2.0.10
 pkgrel=1
 pkgdesc="The MDM Display Manager with consolekit support for non-systemd setups"
 arch=('i686' 'x86_64')
 url="http://www.linuxmint.com"
 license=('GPL')
-depends=('pam' 'libdmx' 'gtk2' 'libgnomecanvas' 'librsvg'
-         'libxml2' 'libart-lgpl' 'dbus-glib' 'libwebkit')
+depends=('libdmx' 'libgnomecanvas' 'dbus-glib' 'libwebkit')
 makedepends=('gnome-common' 'intltool' 'perl' 'gnome-doc-utils' 'xorg-server' 'pango' 'zenity' 'popt' 'pkg-config' 'automake' 'autoconf' 'libtool')
 provides=('gdm' 'gdm-old' 'mate-display-manager' 'mdm-display-manager')
 conflicts=('gdm' 'mate-display-manager')
@@ -17,78 +17,80 @@ replaces=('mate-display-manager')
 options=('!libtool')
 install='mdm-display-manager.install'
 backup=('etc/mdm/custom.conf' 'etc/pam.d/mdm' 'etc/pam.d/mdm-autologin')
-source=("$_pkgname-$pkgver.zip::https://github.com/linuxmint/$_pkgname/archive/$pkgver.zip"
+source=(#"$_pkgname-$pkgver.zip::https://github.com/linuxmint/$_pkgname/archive/$pkgver.zip"
+	"https://github.com/linuxmint/${_pkgname}/archive/${pkgver}.tar.gz"
 	'mdm.pam'
 	'mdm-autologin.pam'
 	'defaults.conf'
 	'org.cinnamon.pkexec.mdmsetup.policy')
-noextract=()
+sha256sums=('5399f9fd41bd8e3f198d7238f9442fafa4f3951132d3d43954b3da80deb22b68'
+            'd6fa4e4c6325ba3f343c6d42675877cde1fb7d48e11cbb2f4b209b28322d8d75'
+            '479e8fd4d5ef353fec5af776ad05e4f414a92d6f374f9b8f5deef77b9e301bc7'
+            'ce9448356c54d8de5b8af5cdef2b5c30b4e6ae970126ce0c4ef295be557bbd2a'
+            'bd22d536a7a1b455a8f8a45d7d8cc46156cb4ef5f3bc706dd73c89d503acad6b')
 
 prepare() {
-cd ${srcdir}/${_pkgname}-${pkgver}
-aclocal --install
-gnome-doc-prepare --force
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+
+    aclocal --install
+    gnome-doc-prepare --force
 }
 
 build() {
-cd ${srcdir}/${_pkgname}-${pkgver}
-chmod +x ./autogen.sh
-export AUTOMAKE=automake
-./autogen.sh --enable-ipv6=yes --with-prefetch \
---prefix=/usr --with-console-kit=yes --sysconfdir=/etc \
---with-systemd=no --libexecdir=/usr/lib/mdm --localstatedir=/var/lib \
---disable-static --with-xevie=yes --disable-scrollkeeper \
---enable-secureremote=yes --enable-ipv6=yes \
---enable-compile-warnings=no --sbindir=/usr/bin \
-LDFLAGS="-lXau -lm"
-sed -i -e 's|${prefix}|/usr|' config.h
-make DESTDIR=$pkgdir
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+
+    chmod +x ./autogen.sh
+    export AUTOMAKE=automake
+    ./autogen.sh --enable-ipv6=yes --with-prefetch \
+    --prefix=/usr --with-console-kit=yes --sysconfdir=/etc \
+    --with-systemd=no --libexecdir=/usr/lib/mdm --localstatedir=/var/lib \
+    --disable-static --with-xevie=yes --disable-scrollkeeper \
+    --enable-secureremote=yes --enable-ipv6=yes \
+    --enable-compile-warnings=no --sbindir=/usr/bin \
+    LDFLAGS="-lXau -lm"
+    sed -i -e 's|${prefix}|/usr|' config.h
+    make DESTDIR=${pkgdir}
 }
 
 package() {
-cd ${srcdir}/${_pkgname}-${pkgver}
-make DESTDIR=$pkgdir install
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    make DESTDIR=${pkgdir} install
 
-msg2 'Adding PAM rules'
-#PAM, we use our own, not LinuxMint stuff, problem?...
-install -m755 -d $pkgdir/etc/pam.d
-install -m644 $srcdir/mdm-autologin.pam $pkgdir/etc/pam.d/mdm-autologin
-install -m644 $srcdir/mdm.pam $pkgdir/etc/pam.d/mdm
+    msg2 'Adding PAM rules'
+    #PAM, we use our own, not LinuxMint stuff, problem?...
+    install -m755 -d "${pkgdir}/etc/pam.d"
+    install -m644    "${srcdir}/mdm-autologin.pam" "${pkgdir}/etc/pam.d/mdm-autologin"
+    install -m644    "${srcdir}/mdm.pam"           "${pkgdir}/etc/pam.d/mdm"
 
-msg2 'Adding config files'
-#configuration
-install -m444 "${srcdir}/defaults.conf" "${pkgdir}/usr/share/mdm/"
-install -m444 "${srcdir}/defaults.conf" "${pkgdir}/usr/share/mdm/distro.conf"
-rm -f ${pkgdir}/usr/share/xsessions/gnome.desktop || true
 
-msg2 'Adding PolicyKit execution scheme'
-#PolicyKit execution scheme (need some tests)
-install -m755 -d $pkgdir/usr/share/polkit-1/actions/
-install -m644 $srcdir/org.cinnamon.pkexec.mdmsetup.policy $pkgdir/usr/share/polkit-1/actions/
+    msg2 'Adding config files'
+    #configuration
+    install -m444 "${srcdir}/defaults.conf" "${pkgdir}/usr/share/mdm/"
+    install -m444 "${srcdir}/defaults.conf" "${pkgdir}/usr/share/mdm/distro.conf"
+    rm -f "${pkgdir}/usr/share/xsessions/gnome.desktop" || true
 
-#Why on the hay this directory is created empty in etc, remove it
-rmdir $pkgdir/etc/dm
+    msg2 'Adding PolicyKit execution scheme'
+    #PolicyKit execution scheme (need some tests)
+    install -m755 -d "${pkgdir}/usr/share/polkit-1/actions/"
+    install -m644    "${srcdir}/org.cinnamon.pkexec.mdmsetup.policy" "${pkgdir}/usr/share/polkit-1/actions/"
 
-msg2 'Adding faces'
-#Fix mdm files conflict with gnome-control-center (usr/share/pixmaps/faces/*)
-install -m755 -d $pkgdir/usr/share/pixmaps/faces/
+    #Why on the hay this directory is created empty in etc, remove it
+    rmdir "${pkgdir}/etc/dm"
 
-make DESTDIR=$pkgdir install -C gui/faces
+    msg2 'Adding faces'
+    #Fix mdm files conflict with gnome-control-center (usr/share/pixmaps/faces/*)
+    install -m755 -d "${pkgdir}/usr/share/pixmaps/faces/"
 
-msg2 'Adding applications'
-#Fix gdmsetup.desktop
-sed -i -e 's|^Exec=gksu|Exec=pkexec|' $pkgdir/usr/share/mdm/applications/mdmsetup.desktop
-sed -i -e 's|^Categories=|Categories=GNOME;GTK;System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;|' $pkgdir/usr/share/mdm/applications/mdmsetup.desktop
+    make DESTDIR=${pkgdir} install -C gui/faces
 
-#Fix erroneous path for certain applications
-install -m755 -d $pkgdir/usr/share/applications
-mv -f $pkgdir/usr/share/mdm/applications/*.* $pkgdir/usr/share/applications
-chmod 755 $pkgdir/usr/share/applications/*.*
-rmdir $pkgdir/usr/share/mdm/applications
+    msg2 'Adding applications'
+    #Fix gdmsetup.desktop
+    sed -i -e 's|^Exec=gksu|Exec=pkexec|' "${pkgdir}/usr/share/mdm/applications/mdmsetup.desktop"
+    sed -i -e 's|^Categories=|Categories=GNOME;GTK;System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;|' "${pkgdir}/usr/share/mdm/applications/mdmsetup.desktop"
 
+    #Fix erroneous path for certain applications
+    install -m755 -d "${pkgdir}/usr/share/applications"
+    mv -f ${pkgdir}/usr/share/mdm/applications/*.* "${pkgdir}/usr/share/applications"
+    chmod 755 ${pkgdir}/usr/share/applications/*.*
+    rmdir "${pkgdir}/usr/share/mdm/applications"
 }
-sha256sums=('3360a866fd8700f06a02fbcd1276410bf60bb82412c56d689912eae5a1d74be9'
-            'd6fa4e4c6325ba3f343c6d42675877cde1fb7d48e11cbb2f4b209b28322d8d75'
-            '479e8fd4d5ef353fec5af776ad05e4f414a92d6f374f9b8f5deef77b9e301bc7'
-            'ce9448356c54d8de5b8af5cdef2b5c30b4e6ae970126ce0c4ef295be557bbd2a'
-            'bd22d536a7a1b455a8f8a45d7d8cc46156cb4ef5f3bc706dd73c89d503acad6b')