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

[Andreas Radke]

    Date: Thursday, November 13, 2014 @ 16:44:48
  Author: andyrtr
Revision: 226192

upgpkg: bluez 5.25-2

ship all built tools, FS#42716 - let's pray it won't lead to file conflicts

Modified:
  bluez/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-13 14:35:24 UTC (rev 226191)
+++ PKGBUILD	2014-11-13 15:44:48 UTC (rev 226192)
@@ -6,7 +6,7 @@
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
 pkgver=5.25
-pkgrel=1
+pkgrel=2
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -38,8 +38,7 @@
           --enable-sixaxis \
           --enable-experimental \
           --enable-library # this is deprecated
-
-  make # all # V=1
+  make
 }
 
 check() {
@@ -56,9 +55,6 @@
   conflicts=('obexd-client' 'obexd-server')
 
   cd ${pkgbase}-${pkgver}
-  #make DESTDIR=${pkgdir} install
-  #return 1
-  
   make DESTDIR=${pkgdir} \
        install-libexecPROGRAMS \
        install-dbussessionbusDATA \
@@ -92,12 +88,13 @@
        install-binPROGRAMS \
        install-man1
 
-  # add experimental BT LE manager - FS#41132
-  install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/btmgmt ${pkgdir}/usr/bin/btmgmt
-  # add gatttool useful with Bluetooth 4.0LE 
+  # add missing tools FS#41132, FS#41687, FS#42716
+  for files in `find tools/ -type f -perm -755`; do
+    filename=$(basename $files)
+    install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/$filename ${pkgdir}/usr/bin/$filename
+  done
+  # add gatttool usefulbdaddr with Bluetooth 4.0LE 
   install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/attrib/gatttool ${pkgdir}/usr/bin/gatttool
-  # add bdaddr for changing the bluetooth device address - FS#41687
-  install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/tools/bdaddr ${pkgdir}/usr/bin/bdaddr
   
   # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
   #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES