summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSonic-Y3k2016-09-07 00:31:03 +0200
committerSonic-Y3k2016-09-07 00:31:03 +0200
commit6d224e750e2dc2b0ba2bd622baf74ed1ca8f9e8d (patch)
tree4bf83c64a30f604ca1d4fd5192d5bbdba1388a39
parentb338f102713f89a99c77bbe2c95b329f499d683b (diff)
downloadaur-6d224e750e2dc2b0ba2bd622baf74ed1ca8f9e8d.tar.gz
Rearranged conflicts
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f156e97a66..556b3cccb7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
pkgbase = bcm20702a1-firmware
pkgdesc = Broadcom bluetooth firmware.
pkgver = 1201710
- pkgrel = 5
+ pkgrel = 6
url = http://asus.com
arch = any
license = Custom
makedepends = bluez-utils
makedepends = gawk
makedepends = sed
- conflicts = bt-dw1560-firmware
source = http://dlcdnet.asus.com/pub/ASUS/wireless/USB-BT400/DR_USB_BT400_1201710_Windows.zip
source = filelist.txt
sha256sums = a84889e296add13cae389524b790133519666826ba899c6f82cd6528a80fefcb
@@ -19,12 +18,14 @@ pkgname = bcm4335c0-firmware
pkgname = bcm4350c5-firmware
pkgdesc = Broadcom bluetooth firmware for BCM4350C5 based devices.
+ conflicts = bcm4350-firmware
pkgname = bcm4356a2-firmware
pkgdesc = Broadcom bluetooth firmware for BCM4356A2 based devices.
pkgname = bcm20702a1-firmware
pkgdesc = Broadcom bluetooth firmware for BCM20702A1 based devices.
+ conflicts = bt-dw1560-firmware
pkgname = bcm20702b0-firmware
pkgdesc = Broadcom bluetooth firmware for BCM20702B0 based devices.
diff --git a/PKGBUILD b/PKGBUILD
index a6634675274..0b30272dc3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,12 @@
pkgbase=bcm20702a1-firmware
pkgname=('bcm4335c0-firmware' 'bcm4350c5-firmware' 'bcm4356a2-firmware' 'bcm20702a1-firmware' 'bcm20702b0-firmware' 'bcm20703a1-firmware' 'bcm43142a0-firmware')
pkgver=1201710
-pkgrel=5
+pkgrel=6
arch=('any')
pkgdesc="Broadcom bluetooth firmware."
url="http://asus.com"
license=("Custom")
makedepends=('bluez-utils' 'gawk' 'sed')
-conflicts=('bt-dw1560-firmware')
source=("http://dlcdnet.asus.com/pub/ASUS/wireless/USB-BT400/DR_USB_BT400_${pkgver}_Windows.zip"
"filelist.txt")
sha256sums=('a84889e296add13cae389524b790133519666826ba899c6f82cd6528a80fefcb'
@@ -42,6 +41,7 @@ package_bcm4335c0-firmware() {
package_bcm4350c5-firmware() {
pkgdesc="Broadcom bluetooth firmware for BCM4350C5 based devices."
+ conflicts=('bcm4350-firmware')
cd "${srcdir}"
mkdir -p ${pkgdir}/usr/lib/firmware/brcm
@@ -64,6 +64,7 @@ package_bcm4356a2-firmware() {
package_bcm20702a1-firmware() {
pkgdesc="Broadcom bluetooth firmware for BCM20702A1 based devices."
+ conflicts=('bt-dw1560-firmware')
cd "${srcdir}"
mkdir -p ${pkgdir}/usr/lib/firmware/brcm