diff options
author | sirlucjan | 2017-09-06 21:15:22 +0200 |
---|---|---|
committer | sirlucjan | 2017-09-06 21:15:22 +0200 |
commit | 682c2b5bb1b169e78dc61970f904b11616d2128d (patch) | |
tree | 2c9a8f08e0055ab7d61efc34234e838ae56a5bcd | |
parent | 952696094ba7283209a9cec7ff0f128ae06c090a (diff) | |
download | aur-682c2b5bb1b169e78dc61970f904b11616d2128d.tar.gz |
Cleanup && bump to 0.15.0
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | PKGBUILD | 47 | ||||
-rw-r--r-- | sddm.install | 24 | ||||
-rw-r--r-- | sddm.sysusers | 1 | ||||
-rw-r--r-- | sddm.tmpfiles | 1 |
5 files changed, 40 insertions, 54 deletions
@@ -1,29 +1,30 @@ -# Generated by mksrcinfo v8 -# Wed Feb 22 09:06:39 UTC 2017 pkgbase = sddm-git pkgdesc = The Simple Desktop Display Manager - pkgver = 0.13.0.10.gf19e0f3 + pkgver = 0.15.0.r1044.ge26c1e6 pkgrel = 1 url = https://github.com/sddm/sddm - install = sddm.install arch = i686 arch = x86_64 license = GPL - makedepends = git - makedepends = cmake makedepends = extra-cmake-modules - makedepends = qt5-tools makedepends = python-docutils + makedepends = qt5-tools + makedepends = git depends = qt5-declarative - depends = upower + depends = xorg-xauth + depends = xorg-server provides = sddm provides = display-manager conflicts = sddm - conflicts = display-manager backup = usr/share/sddm/scripts/Xsetup + backup = etc/pam.d/sddm backup = etc/sddm.conf - source = git+https://github.com/sddm/sddm.git + source = git://github.com/sddm/sddm.git#branch=master + source = sddm.sysusers + source = sddm.tmpfiles sha256sums = SKIP + sha256sums = 421d6d137a32b7a749427f4ab770e5adeef7dac66b138ab6e216ddc0cf4e2cb6 + sha256sums = db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677 pkgname = sddm-git @@ -1,29 +1,32 @@ -# Maintainer: Jerome Leclanche <jerome@leclan.ch> +# Maintainer: Piotr Gorski <lucjan.lucjanov@gmail.com> +# Contributor: Jerome Leclanche <jerome@leclan.ch> _pkgbase="sddm" pkgname="$_pkgbase-git" -pkgver=0.14.0.29.g078c4d8 +pkgver=0.15.0.r1044.ge26c1e6 pkgrel=1 pkgdesc="The Simple Desktop Display Manager" arch=("i686" "x86_64") url="https://github.com/sddm/sddm" license=("GPL") -depends=("qt5-declarative" "upower") -makedepends=("git" "cmake" "extra-cmake-modules" "qt5-tools" "python-docutils") -provides=("$_pkgbase" "display-manager") -conflicts=("$_pkgbase" "display-manager") -install="$_pkgbase.install" -backup=( - "usr/share/sddm/scripts/Xsetup" - "etc/sddm.conf" -) -source=("git+https://github.com/sddm/$_pkgbase.git") -sha256sums=("SKIP") +depends=('qt5-declarative' 'xorg-xauth' 'xorg-server') +makedepends=('extra-cmake-modules' 'python-docutils' 'qt5-tools' 'git') +provides=("$_pkgbase" 'display-manager') +conflicts=("$_pkgbase") +backup=('usr/share/sddm/scripts/Xsetup' + 'etc/pam.d/sddm' + 'etc/sddm.conf') +source=("git://github.com/sddm/sddm.git#branch=master" +sddm.sysusers sddm.tmpfiles) +sha256sums=('SKIP' + '421d6d137a32b7a749427f4ab770e5adeef7dac66b138ab6e216ddc0cf4e2cb6' + 'db625f2a3649d6d203e1e1b187a054d5c6263cadf7edd824774d8ace52219677') pkgver() { cd "$srcdir/$_pkgbase" - git describe --always | sed "s/^v//g" | sed "s/-/./g" + _ver="$(cat CMakeLists.txt | grep -m3 -e _VERSION_MAJOR -e _VERSION_MINOR -e _VERSION_PATCH | grep -o "[[:digit:]]*" | paste -sd'.')" + echo "${_ver}.r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)" } build() { @@ -32,13 +35,17 @@ build() { cd build cmake "$srcdir/$_pkgbase" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_MAN_PAGES=ON - make + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ + -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \ + -DBUILD_MAN_PAGES=ON + make } package() { - cd build - make DESTDIR="$pkgdir" install + cd build + make DESTDIR="${pkgdir}" install + + install -Dm644 "$srcdir"/sddm.sysusers "$pkgdir"/usr/lib/sysusers.d/sddm.conf + install -Dm644 "$srcdir"/sddm.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/sddm.conf } diff --git a/sddm.install b/sddm.install deleted file mode 100644 index 904a73ac224b..000000000000 --- a/sddm.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - if ! getent group sddm > /dev/null; then - groupadd --system sddm - fi - if ! getent passwd sddm > /dev/null; then - useradd -c "Simple Desktop Display Manager" --system -d /var/lib/sddm -s /usr/bin/nologin -g sddm sddm - passwd -l sddm > /dev/null - fi - mkdir -p /var/lib/sddm - chown -R sddm:sddm /var/lib/sddm > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - if getent passwd sddm >/dev/null; then - userdel sddm - fi - if getent group sddm >/dev/null; then - groupdel sddm - fi -} diff --git a/sddm.sysusers b/sddm.sysusers new file mode 100644 index 000000000000..a48f92941391 --- /dev/null +++ b/sddm.sysusers @@ -0,0 +1 @@ +u sddm - "Simple Desktop Display Manager" /var/lib/sddm diff --git a/sddm.tmpfiles b/sddm.tmpfiles new file mode 100644 index 000000000000..300d646138c1 --- /dev/null +++ b/sddm.tmpfiles @@ -0,0 +1 @@ +d /var/lib/sddm 0755 sddm sddm |