[arch-commits] Commit in dbus/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, August 30, 2018 @ 22:15:24
  Author: heftig
Revision: 333148

1.12.10-2: Disable X11 autolaunching accidentally reintroduced with 1.12.0-1, other minor fixes

Modified:
  dbus/trunk/PKGBUILD	(contents, properties)

----------+
 PKGBUILD |   46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-30 20:54:07 UTC (rev 333147)
+++ PKGBUILD	2018-08-30 22:15:24 UTC (rev 333148)
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Contributor: Tom Gundersen <teg at jklm.no>
@@ -7,7 +6,7 @@
 pkgbase=dbus
 pkgname=(dbus dbus-docs)
 pkgver=1.12.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64)
@@ -21,12 +20,12 @@
               '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
 pkgver() {
-  cd $pkgbase
+  cd dbus
   git describe --tags | sed 's/^dbus-//;s/-/+/g'
 }
 
 prepare() {
-  cd $pkgbase
+  cd dbus
 
   # Reduce docs size
   printf '%s\n' >>Doxyfile.in \
@@ -36,22 +35,24 @@
 }
 
 build() {
-  cd $pkgbase
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
-      --with-system-pid-file=/run/dbus/pid \
-      --with-system-socket=/run/dbus/system_bus_socket \
-      --with-console-auth-dir=/run/console/ \
-      --enable-inotify --disable-static \
-      --disable-verbose-mode --disable-asserts \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --enable-systemd --enable-user-session
+  cd dbus
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    runstatedir=/run \
+    --libexecdir=/usr/lib/dbus-1.0 \
+    --with-system-socket=/run/dbus/system_bus_socket \
+    --with-dbus-session-bus-connect-address=unix:runtime=yes \
+    --with-dbus-user=dbus \
+    --enable-user-session \
+    --disable-static \
+    --without-x
   make
 }
 
 check() {
-  cd $pkgbase
-  make check
+  make -C dbus check
 }
 
 package_dbus() {
@@ -59,13 +60,11 @@
   conflicts=(libdbus)
   replaces=(libdbus)
 
-  cd $pkgbase
+  DESTDIR="$pkgdir" make -C dbus install
 
-  make DESTDIR="$pkgdir" install
-
   rm -r "$pkgdir/var/run"
 
-  install -Dt "$pkgdir/usr/share/licenses/$pkgbase" -m644 COPYING
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
 
   # We have a pre-assigned uid (81)
   echo 'u dbus 81 "System Message Bus"' |
@@ -77,10 +76,11 @@
 
 package_dbus-docs() {
   pkgdesc+=" (documentation)"
-  depends=(dbus)
+  depends=()
 
-  install -d "$pkgdir/usr/share/licenses"
-  ln -s dbus "$pkgdir/usr/share/licenses/dbus-docs"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
 
   mv doc "$pkgdir/usr/share"
 }
+
+# vim:set sw=2 et:


Property changes on: dbus/trunk/PKGBUILD
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property