diff --git a/b43-fwcutter.changes b/b43-fwcutter.changes index 3ac7dc2..df4adce 100644 --- a/b43-fwcutter.changes +++ b/b43-fwcutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 11 14:04:45 CEST 2008 - cstender@suse.de + +- added curl to requires +- improved install_bcm43xx_firmware script + ------------------------------------------------------------------- Thu Apr 10 14:34:00 CEST 2008 - cstender@suse.de diff --git a/b43-fwcutter.spec b/b43-fwcutter.spec index cc0c989..b1a9837 100644 --- a/b43-fwcutter.spec +++ b/b43-fwcutter.spec @@ -16,13 +16,14 @@ Group: Hardware/Wifi AutoReqProv: on Summary: Tool for extracting firmware from newer Broadcom WLAN drivers Version: 011 -Release: 1 +Release: 2 Source: %{name}-%{version}.tar.bz2 Patch0: %{name}.diff Source1: install_bcm43xx_firmware Url: http://developer.berlios.de/projects/bcm43xx/ License: BSD 3-Clause; BSD 4-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: curl Obsoletes: bcm43xx-fwcutter Provides: bcm43xx-fwcutter Supplements: modalias(pci:v000014E4d000043*sv*sd*bc*sc*i*) @@ -66,6 +67,9 @@ install -m 755 %SOURCE1 %{buildroot}/usr/sbin/ %doc README %changelog +* Fri Apr 11 2008 cstender@suse.de +- added curl to requires +- improved install_bcm43xx_firmware script * Thu Apr 10 2008 cstender@suse.de - updated to version 011 - added supplement tag so package gets installed when a bcm43xx diff --git a/install_bcm43xx_firmware b/install_bcm43xx_firmware index 7973742..dc90a0b 100644 --- a/install_bcm43xx_firmware +++ b/install_bcm43xx_firmware @@ -14,14 +14,13 @@ FIRMWARE1=broadcom-wl-4.150.10.5/driver/wl_apsta_mimo.o URL2=http://downloads.openwrt.org/sources FILE2=wl_apsta-3.130.20.0.o -test -z "$( type -p curl)" && { echo "'curl' is not installed, aborting"; exit 1; } -test -z "$( type -p b43-fwcutter)" && { echo "'b43-fwcutter' is not installed, aborting"; exit 1; } +test -z "$( type -p curl)" && { echo "'curl' is not installed, aborting. Please install 'curl' and try again."; exit 1; } +test -z "$( type -p b43-fwcutter)" && { echo "'b43-fwcutter' is not installed, aborting. Please install 'b43-fwcutter' and try again."; exit 1; } test -d /lib/firmware || mkdir -p /lib/firmware TMPDIR=$(mktemp -d /var/tmp/bcm.XXXXXX) || exit 1 -pushd `pwd` >/dev/null -cd $TMPDIR +pushd $TMPDIR >/dev/null echo "Downloading b43 firmware" curl -# -f -o $FILE1 $URL1/$FILE1 @@ -30,7 +29,7 @@ if [ $? -eq 0 ];then tar xjf $FILE1 b43-fwcutter -w /lib/firmware $FIRMWARE1 else - echo "Could not download b43 firmware." + echo "Could not download b43 firmware. Please look at /usr/share/doc/packages/b43-fwcutter/README." fi echo @@ -40,7 +39,7 @@ if [ $? -eq 0 ];then echo "Extracting b43legacy firmware" b43-fwcutter -w /lib/firmware $FILE2 else - echo "Could not download b43legacy firmware." + echo "Could not download b43legacy firmware. Please look at /usr/share/doc/packages/b43-fwcutter/README." fi echo