elogind-229.5-1: updating version

3 files changed, 24 insertions, 41 deletions

diff --git a/pcr/elogind/PKGBUILD b/pcr/elogind/PKGBUILD
index fa81903c8..be724ae2c 100644
--- a/pcr/elogind/PKGBUILD
+++ b/pcr/elogind/PKGBUILD
@@ -1,32 +1,26 @@
 # Maintainer (Manjaro): artoo <artoo@manjaro.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-_pkgname=elogind
-_commit=b486765f115ebbae41117ea493c748491872c4e0
-
 pkgbase=elogind
 pkgname=('elogind' 'libelogind')
-pkgver=226
-pkgrel=5
+pkgver=229.5
+pkgrel=1
 pkgdesc="The systemd project's logind, extracted to a standalone package"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/elogind/elogind"
-license=('GPL')
-makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'dbus-elogind' 'git' 'libcap' 'eudev' 'polkit-elogind')
+license=('GPL' 'LGPL2.1')
+makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc')
 options=('!libtool')
-source=("elogind-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz"
-        "elogind-docs.patch")
-sha256sums=('a0270a1c97d485347be9a91d9e116c5d7c895222f5c57dab62cd528e38468113'
-            '25643e563250b0d322f817288cbe999f1cc2e4804c875725bb92fe5094a902b4')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz")
+sha256sums=('82078a0f5eb0c00c81dcaf2866dc5a954bd5e6e2802954ff7ce37e1ae8ec720d')
 
 prepare() {
-    cd ${_pkgname}-${_commit}
-    patch -Np 1 -i ${srcdir}/elogind-docs.patch
-    autoreconf -vim
+    cd ${pkgbase}-${pkgver}
+    ./autogen.sh
 }
 
 build() {
-    cd ${_pkgname}-${_commit}
+    cd ${pkgbase}-${pkgver}
     intltoolize
     ./configure \
         --sysconfdir=/etc \
@@ -34,33 +28,32 @@ build() {
         --libdir=/usr/lib \
         --libexecdir=/usr/lib \
         --enable-split-usr \
+        --enable-polkit \
         --disable-smack \
         --enable-acl \
         --enable-pam \
+        --with-rootlibdir=/usr/lib \
         --with-udevrulesdir=/usr/lib/udev/rules.d \
         --disable-kdbus
-# --with-rootlibdir=
     make
 }
 
 package_elogind() {
     pkgdesc="The systemd project's logind, extracted to a standalone package"
     provides=("elogind=${pkgver}")
-    depends=('libelogind' 'pam' 'acl' 'dbus-elogind' 'polkit-elogind' 'eudev')
-    conflicts=('systemd-sysvcompat' 'consolekit')
-    # replaces=('consolekit')
-    optdepends=('elogind-openrc: elogind initscript'
-                'dbus-openrc: dbus initscript')
-                #'polkit-elogind: polkit with elogind session tracking')
+    depends=('acl' 'dbus-elogind' 'polkit-elogind' 'eudev' 'libseccomp')
+    conflicts=('systemd-sysvcompat' 'consolekit' 'pm-utils')
+#     replaces=('consolekit' 'pm-utils')
+    optdepends=('elogind-openrc: elogind initscript')
     install=elogind.install
 
-    cd ${_pkgname}-${_commit}
+    cd ${pkgbase}-${pkgver}
     make DESTDIR="${pkgdir}" install
 
     mkdir ${srcdir}/_libelogind
     mv -v ${pkgdir}/usr/lib/pkgconfig ${srcdir}/_libelogind
-	mv -v ${pkgdir}/usr/include/ ${srcdir}/_libelogind
-	mv -v ${pkgdir}/usr/lib/libelogind*.so* ${srcdir}/_libelogind
+    mv -v ${pkgdir}/usr/include/ ${srcdir}/_libelogind
+    mv -v ${pkgdir}/usr/lib/libelogind*.so* ${srcdir}/_libelogind
 }
 
 package_libelogind(){
@@ -68,7 +61,8 @@ package_libelogind(){
     provides=('libelogind.so' "libelogind=${pkgver}")
     depends=('libcap')
 
-    cd ${_pkgname}-${_commit}
+    cd ${pkgbase}-${pkgver}
+
     install -dm755 ${pkgdir}/usr/lib
     mv ${srcdir}/_libelogind/include ${pkgdir}/usr
     mv ${srcdir}/_libelogind/pkgconfig ${pkgdir}/usr/lib
diff --git a/pcr/elogind/elogind-docs.patch b/pcr/elogind/elogind-docs.patch
deleted file mode 100644
index b48e52d73..000000000
--- a/pcr/elogind/elogind-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -191,12 +191,6 @@
- rootbin_PROGRAMS =
- pkglibexec_PROGRAMS =
- 
--dist_doc_DATA = \
--	README \
--	NEWS \
--	LICENSE.LGPL2.1 \
--	LICENSE.GPL2
--
- @INTLTOOL_POLICY_RULE@
- 
- # ------------------------------------------------------------------------------
diff --git a/pcr/elogind/elogind.install b/pcr/elogind/elogind.install
index 9a271f840..004f98a2b 100644
--- a/pcr/elogind/elogind.install
+++ b/pcr/elogind/elogind.install
@@ -1,5 +1,9 @@
 post_install() {
     sed -e 's|pam_systemd.so|pam_elogind.so|' -i etc/pam.d/system-login
+
+    if grep pam_ck_connector.so etc/pam.d/system-login >/dev/null;then
+        sed -e 's|pam_ck_connector.so nox11|pam_elogind.so|' -i etc/pam.d/system-login
+    fi
 }
 
 post_remove(){