diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
| commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
| tree | 0f63651432b8448262549265a5420fff1ab665e8 /extra/xorg-xdm | |
| parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
| parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'extra/xorg-xdm')
| -rw-r--r-- | extra/xorg-xdm/PKGBUILD | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD index ef12a75d4..7c8f2ba23 100644 --- a/extra/xorg-xdm/PKGBUILD +++ b/extra/xorg-xdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161610 2012-06-12 11:02:41Z jgc $ +# $Id: PKGBUILD 163529 2012-07-14 17:17:56Z dreisner $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdm pkgver=1.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="X Display Manager" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -46,6 +46,10 @@ build() { --with-xdmscriptdir=/etc/X11/xdm \ --with-pixmapdir=/usr/share/xdm/pixmaps make +} + +package() { + cd "${srcdir}/xdm-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/var/lib/xdm" install -m755 -d "${pkgdir}/etc/pam.d" @@ -54,4 +58,7 @@ build() { install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/* + + sed -i 's|^Alias=.*|Alias=display-manager.service|' \ + "$pkgdir/usr/lib/systemd/system/xdm.service" } |