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

[Andreas Radke]

    Date: Sunday, November 3, 2013 @ 19:24:14
  Author: andyrtr
Revision: 198765

upgpkg: bluez 5.10-2

add check function; split out cups backend and hid2hci; use Makefile targets for splitting - moves btmon and bluetoothctl to utils pkg, both shouldn't be essientially needed in the core pkg

Modified:
  bluez/trunk/PKGBUILD

----------+
 PKGBUILD |   91 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 62 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-03 16:44:35 UTC (rev 198764)
+++ PKGBUILD	2013-11-03 18:24:14 UTC (rev 198765)
@@ -4,9 +4,9 @@
 # Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
 
 pkgbase=bluez
-pkgname=('bluez' 'bluez-utils' 'bluez-libs')
+pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci')
 pkgver=5.10
-pkgrel=1
+pkgrel=2
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -15,7 +15,7 @@
 md5sums=('7dce03b332b3a3e7465fb88352b8a404')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   ./configure \
           --prefix=/usr \
@@ -24,51 +24,84 @@
           --localstatedir=/var \
           --libexecdir=/usr/lib \
           --enable-library # this is deprecated
+#          --enable-experimental \
 
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make -k check
+}
+
+
 package_bluez() {
   pkgdesc="Daemons for the bluetooth protocol stack"
   depends=('libical' 'dbus' 'glib2')
-  optdepends=("cups: CUPS backend")
   backup=('etc/dbus-1/system.d/bluetooth.conf')
   conflicts=('obexd-client' 'obexd-server')
 
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-libexecPROGRAMS \
+       install-dbussessionbusDATA \
+       install-systemdsystemunitDATA \
+       install-systemduserunitDATA \
+       install-dbussystembusDATA \
+       install-dbusDATA \
+       install-man8
+}
 
-  ### split out bluez-utils
-  rm -rf "$srcdir/_utils"
-  install -dm755 "$srcdir"/_utils/usr/share/man
-  mv "$pkgdir"/usr/share/man/man1 "$srcdir"/_utils/usr/share/man/
-  install -dm755 "$srcdir"/_utils/usr/bin
-  mv "$pkgdir"/usr/bin/{bccmd,ciptool,hciattach,hciconfig,hcidump,hcitool,l2ping,l2test,rctest,rfcomm,sdptool}\
-          "$srcdir"/_utils/usr/bin/
-  install -dm755 "$srcdir"/_utils/usr/lib
-  mv "$pkgdir"/usr/lib/udev "$srcdir"/_utils/usr/lib/
+package_bluez-utils() {
+  pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
+  depends=('dbus' 'systemd')
+  conflicts=('bluez-hcidump')
+  provides=('bluez-hcidump')
+  replaces=('bluez-hcidump' 'bluez<=4.101')
 
-  ### split out bluez-libs
-  rm -rf "$srcdir/_libs"
-  install -dm755 "$srcdir"/_libs/usr/lib/
-  mv "$pkgdir"/usr/lib/{pkgconfig,libbluetooth*} \
-          "$srcdir"/_libs/usr/lib/
-  mv "$pkgdir"/usr/include \
-          "$srcdir"/_libs/usr/
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-binPROGRAMS \
+       install-man1
+
+  # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
+  #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
+  #rmdir ${pkgdir}/usr/lib
+  rm -rf ${pkgdir}/usr/lib
+  
+  # move the hid2hci man page out
+  mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
 }
 
 package_bluez-libs() {
   pkgdesc="Deprecated libraries for the bluetooth protocol stack"
   depends=('glibc')
+  license=('LGPL2.1')
 
-  mv "$srcdir/_libs"/* "$pkgdir"
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-includeHEADERS \
+       install-libLTLIBRARIES \
+       install-pkgconfigDATA
 }
-package_bluez-utils() {
-  pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
+
+package_bluez-cups() {
+  pkgdesc="CUPS printer backend for Bluetooth printers"
+  depends=('cups')
+
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install-cupsPROGRAMS
+}
+
+package_bluez-hid2hci() {
+  pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
   depends=('systemd')
-  conflicts=('bluez-hcidump')
-  provides=('bluez-hcidump')
-  replaces=('bluez-hcidump' 'bluez<=4.101')
 
-  mv "$srcdir/_utils"/* "$pkgdir"
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} \
+       install-udevPROGRAMS \
+       install-rulesDATA
+  
+  install -dm755 ${pkgdir}/usr/share/man/man1
+  mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
 }