systemd-git: provide/conflict sysvcompat

systemd-git/PKGBUILD

@@ -1,23 +1,23 @@
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd-git
-pkgver=20120526
+pkgver=20120604
 pkgrel=1
 pkgdesc="system and service manager"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
 depends=('acl' 'dbus-core' 'glib2' 'hwids' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'xz')
-makedepends=('cryptsetup' 'docbook-xsl' 'git' 'gobject-introspection' 'gperf'
+makedepends=('docbook-xsl' 'git' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'libxslt')
 optdepends=('cryptsetup: required for encrypted block devices'
             'dbus-python: systemd-analyze'
             'initscripts: legacy hostname, locale, and vconsole support'
             'selinux-usr-libselinux: integration with security enhanced Linux'
             'systemd-arch-units-git: collection of native unit files for Arch daemon/init scripts'
             'tcp_wrappers: filter remote access to services')
-provides=('systemd' 'libsystemd' 'systemd-tools' 'udev=999')
-conflicts=('systemd' 'libsystemd' 'systemd-tools' 'udev')
+provides=('systemd' 'libsystemd' 'systemd-sysvcompat' 'systemd-tools' 'udev=999')
+conflicts=('systemd' 'libsystemd' 'systemd-sysvcompat' 'systemd-tools' 'sysvinit' 'initscripts' 'udev')
 groups=('systemd')
 options=('!libtool')
 backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
@@ -31,10 +31,12 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
         etc/systemd/journald.conf
         etc/udev/udev.conf)
 install='systemd.install'
-source=('initcpio-hook-udev'
+source=('locale.sh'
+        'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp')
-md5sums=('e99e9189aa2f6084ac28b8ddf605aeb8'
+md5sums=('f15956945052bb911e5df81cf5e7e5dc'
+         'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
          'df69615503ad293c9ddf9d8b7755282d')
 
@@ -89,6 +91,15 @@ package() {
   ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
   ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
 
+  install -dm755 "$pkgdir/sbin"
+  for tool in runlevel reboot shutdown poweroff halt telinit; do
+    ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
+  done
+  ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
+
+  # systemd-wide user locale
+  install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh"
+
   # fix systemd-analyze for python2
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"