Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / bluez


Commits:
d51b1ff3 by Robin Candau at 2024-03-07T19:00:03+01:00
upgpkg: 5.73-2: Adapt package functions to new sources locations + Delete 
unpackaged files check for the removed sixaxis plugin

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
 pkgbase = bluez
        pkgver = 5.73
-       pkgrel = 1
+       pkgrel = 2
        url = http://www.bluez.org/
        arch = x86_64
        license = GPL-2.0-only
@@ -40,6 +40,8 @@ pkgname = bluez-utils
        depends = glibc
        depends = readline
        optdepends = ell: for btpclient
+       provides = bluez-plugins
+       replaces = bluez-plugins
 
 pkgname = bluez-libs
        pkgdesc = Deprecated libraries for the bluetooth protocol stack


=====================================
PKGBUILD
=====================================
@@ -7,7 +7,7 @@
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 
'bluez-deprecated-tools' 'bluez-hid2hci' 'bluez-mesh' 'bluez-obex')
 pkgver=5.73
-pkgrel=1
+pkgrel=2
 url="http://www.bluez.org/";
 arch=('x86_64')
 license=('GPL-2.0-only')
@@ -77,13 +77,13 @@ package_bluez() {
   _install fakeinstall/usr/lib/systemd/system/bluetooth.service
   _install fakeinstall/usr/share/dbus-1/system-services/org.bluez.service
   _install fakeinstall/usr/share/dbus-1/system.d/bluetooth.conf
+  _install fakeinstall/etc/bluetooth/main.conf
+  _install fakeinstall/etc/bluetooth/input.conf
+  _install fakeinstall/etc/bluetooth/network.conf
   _install fakeinstall/usr/share/man/man8/bluetoothd.8
 
   # ship upstream main config files
   install -dm555 "${pkgdir}"/etc/bluetooth
-  install -Dm644 "${srcdir}"/"${pkgbase}"-${pkgver}/src/main.conf 
"${pkgdir}"/etc/bluetooth/main.conf
-  install -Dm644 "${srcdir}"/"${pkgbase}"-${pkgver}/profiles/input/input.conf 
"${pkgdir}"/etc/bluetooth/input.conf
-  install -Dm644 
"${srcdir}"/"${pkgbase}"-${pkgver}/profiles/network/network.conf 
"${pkgdir}"/etc/bluetooth/network.conf
 
   # add basic documention
   install -dm755 "${pkgdir}"/usr/share/doc/"${pkgbase}"/dbus-apis
@@ -155,11 +155,11 @@ package_bluez-mesh() {
   _install fakeinstall/usr/lib/systemd/system/bluetooth-mesh.service
   _install fakeinstall/usr/share/dbus-1/system-services/org.bluez.mesh.service
   _install fakeinstall/usr/share/dbus-1/system.d/bluetooth-mesh.conf
+  _install fakeinstall/etc/bluetooth/mesh-main.conf
   _install fakeinstall/usr/share/man/man8/bluetooth-meshd.8
 
   # ship upstream mesh config file
   install -dm555 "${pkgdir}"/etc/bluetooth
-  install -Dm644 "${srcdir}"/"${pkgbase}"-${pkgver}/mesh/mesh-main.conf 
"${pkgdir}"/etc/bluetooth/mesh-main.conf
 }
 
 package_bluez-obex() {
@@ -170,13 +170,10 @@ package_bluez-obex() {
   _install fakeinstall/usr/lib/bluetooth/obexd
   _install fakeinstall/usr/lib/systemd/user/obex.service
   _install fakeinstall/usr/share/dbus-1/services/org.bluez.obex.service
+  _install fakeinstall/usr/lib/systemd/user/dbus-org.bluez.obex.service
   _install fakeinstall/usr/share/man/man5/org.bluez.obex*.5  
 
-  # fix obex file transfer - https://bugs.archlinux.org/task/45816
-  ln -fs /usr/lib/systemd/user/obex.service 
"${pkgdir}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
-
   # make sure there are no files left to install
   rm fakeinstall/usr/lib/libbluetooth.la
-  rm fakeinstall/usr/lib/bluetooth/plugins/sixaxis.la
   find fakeinstall -depth -print0 | xargs -0 rmdir
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/bluez/-/commit/d51b1ff3a07b20ad95feee22e0a9412bbe987627

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/bluez/-/commit/d51b1ff3a07b20ad95feee22e0a9412bbe987627
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to