[arch-commits] Commit in (4 files)

[Jan de Groot]

    Date: Saturday, October 11, 2008 @ 17:45:37
  Author: jgc
Revision: 14991

Split dbus into a core and an X11 package

Added:
  dbus-core/
    (from rev 14990, dbus)
Modified:
  dbus-core/trunk/PKGBUILD
Deleted:
  dbus-core/repos/extra-i686/
  dbus-core/repos/extra-x86_64/

----------+
 PKGBUILD |   35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

Copied: dbus-core (from rev 14990, dbus)


Property changes on: dbus-core
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: dbus-core/trunk/PKGBUILD
===================================================================
--- dbus/trunk/PKGBUILD	2008-10-11 21:33:59 UTC (rev 14990)
+++ dbus-core/trunk/PKGBUILD	2008-10-11 21:45:37 UTC (rev 14991)
@@ -2,47 +2,46 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 #
-pkgname=dbus
+pkgname=dbus-core
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0' 'libx11' 'libsm')
+depends=('expat>=2.0')
 options=(!libtool)
 install=dbus.install
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 	dbus)
 md5sums=('f71641385768e99361bd298568207cee'
          'f3fd196cc278bd7b45a4ca01fb8f7894')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/dbus-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   	      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
               --with-system-pid-file=/var/run/dbus.pid \
               --disable-verbose-mode --disable-static \
-	      --disable-tests --disable-asserts || return 1
+	      --disable-tests --disable-asserts --without-x || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  chown 81:81 ${startdir}/pkg/var/run/dbus || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  chown 81:81 "${pkgdir}/var/run/dbus" || return 1
 
-  install -m755 -d  ${startdir}/pkg/etc/rc.d || return 1
-  install -m 755 ${startdir}/dbus ${startdir}/pkg/etc/rc.d/ || return 1
+  install -m755 -d "${pkgdir}/etc/rc.d" || return 1
+  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" || return 1
 
   #Fix configuration file
-  sed -i -e 's|<user>81</user>|<user>dbus</user>|' ${startdir}/pkg/etc/dbus-1/system.conf || return 1
+  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf" || return 1
 
   #install .keep files so pacman doesn't delete empty dirs
-  touch ${startdir}/pkg/usr/share/dbus-1/services/.keep || return 1
-  touch ${startdir}/pkg/usr/share/dbus-1/system-services/.keep || return 1
-  touch ${startdir}/pkg/etc/dbus-1/session.d/.keep || return 1
-  touch ${startdir}/pkg/etc/dbus-1/system.d/.keep || return 1
+  touch "${pkgdir}/usr/share/dbus-1/services/.keep" || return 1
+  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" || return 1
+  touch "${pkgdir}/etc/dbus-1/session.d/.keep" || return 1
+  touch "${pkgdir}/etc/dbus-1/system.d/.keep" || return 1
 
-  rmdir ${startdir}/pkg/usr/lib/dbus-1.0/dbus-1 || return 1
+  rmdir "${pkgdir}/usr/lib/dbus-1.0/dbus-1" || return 1
 
-  install -d -m755 ${startdir}/pkg/usr/share/licenses/dbus
-  install -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-    ${startdir}/pkg/usr/share/licenses/dbus/ || return 1
+  install -d -m755 "${pkgdir}/usr/share/licenses/dbus"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/" || return 1
 }