rpms/hal/devel hal-remove-dell-killswitch.patch, NONE, 1.1 hal.spec, 1.185, 1.186

Bastien Nocera hadess at fedoraproject.org
Tue Mar 3 10:55:13 UTC 2009 

Author: hadess

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7321

Modified Files:
	hal.spec 
Added Files:
	hal-remove-dell-killswitch.patch 
Log Message:
* Tue Mar 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.5.12-23.20090226git
- Remove Dell killswitches support, they're handled through the kernel's
  dell_laptop module instead now (#488177), removes requires for smbios-utils


hal-remove-dell-killswitch.patch:

--- NEW FILE hal-remove-dell-killswitch.patch ---
diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux
--- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux	2008-08-22 07:34:47.000000000 +0100
+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux	2009-03-03 10:45:20.000000000 +0000
@@ -8,11 +8,6 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 
-DELL_WCTL=/usr/bin/dellWirelessCtl
-if [ -x "/usr/sbin/dellWirelessCtl" ]; then
-  DELL_WCTL=/usr/sbin/dellWirelessCtl
-fi
-
 if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
 	value="`hal-system-sonypic getbluetooth`"
@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
 	    exit 1
 	fi
 	exit ${value}
-    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-	if [ -x "$DELL_WCTL" ]; then
-	    # TODO: write our own binary that links with libsmbios?
-	    $DELL_WCTL --st_bt
-	    value=$?
-	    if [ "$value" = "0" ]; then
-	        exit 1
-	    elif [ "$value" = "1" ]; then
-	        exit 0
-	    else
-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	        echo "dellWirelessCtl returned $value" >&2
-                exit 1
-	    fi
-        else
-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-	    exit 1
-	fi
     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
 	read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null
 	if [ $? -eq 0 ]; then
@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
 	echo "Access type not supported" >&2
 	exit 1
     fi
-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-	if [ -x "$DELL_WCTL" ]; then
- 	    # TODO: write our own binary that links with libsmbios?
-	    $DELL_WCTL --st_wlan
-	    value=$?
-	    if [ "$value" = "0" ]; then
-	        exit 1
-	    elif [ "$value" = "1" ]; then
-	        exit 0
-	    else
-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	        echo "dellWirelessCtl returned $value" >&2
-                exit 1
-	    fi
-	else 
-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-	    exit 1
-	fi
-    else
-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	echo "Access type not supported" >&2
-	exit 1
-    fi
-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-	if [ -x "$DELL_WCTL" ]; then
-   	    # TODO: write our own binary that links with libsmbios?
-	    $DELL_WCTL --st_wwan
-	    value=$?
-	    if [ "$value" = "0" ]; then
-	        exit 1
-	    elif [ "$value" = "1" ]; then
-	        exit 0
-	    else
-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	        echo "dellWirelessCtl returned $value" >&2
-                exit 1
-	    fi
-	else 
-	    echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	    echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-	    exit 1
-	fi
-    else
-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	echo "Access type not supported" >&2
-	exit 1
-    fi
 else
     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
     echo "Killswitch type not supported" >&2
diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux
--- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux	2008-10-24 09:45:54.000000000 +0100
+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux	2009-03-03 10:44:49.000000000 +0000
@@ -8,11 +8,6 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 
-DELL_WCTL=/usr/bin/dellWirelessCtl
-if [ -x "/usr/sbin/dellWirelessCtl" ]; then
-    DELL_WCTL=/usr/sbin/dellWirelessCtl
-fi
-
 if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
     if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then
 	hal-system-sonypic setbluetooth $value
@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
 	    exit 1
 	fi
 	exit 0
-    elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-	if [ -x "$DELL_WCTL" ]; then
-	    # TODO: write our own binary that links with libsmbios?
-	    if [ "$value" = "true" ]; then
-	        $DELL_WCTL --bt 1
-	        ret=$?
-	    else
-	        $DELL_WCTL --bt 0
-	        ret=$?
-	    fi
-	    if [ "$ret" != "0" ]; then
-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	        echo "dellWirelessCtl returned $ret" >&2
-	        exit 1
-	    fi
-        else
-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-            exit 1
-        fi
     elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then
         if [ "$value" = "true" ]; then 
 	    bit=1; 
@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue
 	echo "Access type not supported" >&2
 	exit 1
     fi
-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then
-	if [ -x "$DELL_WCTL" ]; then
-	    # As a side effect we disable the physical kill switch
-	    # TODO: write our own binary that links with libsmbios?
-	    if [ "$value" = "true" ]; then
-	        $DELL_WCTL --sw_wlan 0 --wlan 1
-	        ret=$?
-	    else
-	        $DELL_WCTL --sw_wlan 0 --wlan 0
-	        ret=$?
-	    fi
-	    if [ "$ret" != "0" ]; then
-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	        echo "dellWirelessCtl returned $ret" >&2
-                exit 1
-	    fi
-        else
-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-            exit 1
-        fi
-    else
-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	echo "Access type not supported" >&2
-	exit 1
-    fi
-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
-    if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then 
-	if [ -x "$DELL_WCTL" ]; then
-	    # As a side effect we disable the physical kill switch
-	    # TODO: write our own binary that links with libsmbios?
-	    if [ "$value" = "true" ]; then
-	        $DELL_WCTL --sw_wwan 0 --wwan 1
-	        ret=$?
-	    else
-	        $DELL_WCTL --sw_wwan 0 --wwan 0
-	        ret=$?
-	    fi
-	    if [ "$ret" != "0" ]; then
-	        echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	        echo "dellWirelessCtl returned $ret" >&2
-                exit 1
-	    fi
-        else
-            echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-            echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2
-            exit 1
-        fi
-    else
-	echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
-	echo "Access type not supported" >&2
-	exit 1
-    fi
 else
     echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2
     echo "Killswitch type not supported" >&2


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- hal.spec	3 Mar 2009 03:09:32 -0000	1.185
+++ hal.spec	3 Mar 2009 10:54:43 -0000	1.186
@@ -28,7 +28,7 @@
 Name: hal
 Version: 0.5.12
 #Release: 14%{?dist}
-Release: 22.%{?alphatag}%{?dist}
+Release: 23.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc1.tar.bz2
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
@@ -40,6 +40,9 @@
 Patch2: hal-change-priority.patch
 Patch3: hal-add-keys-to-buttons.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=488177
+Patch4: hal-remove-dell-killswitch.patch
+
 Patch7: hal-tablet-evdev.patch
 
 # upstream
@@ -93,7 +96,6 @@
 %endif
 %ifarch %{ix86} x86_64
 Requires: dmidecode >= %{dmidecode_version}
-Requires: smbios-utils
 %endif
 Requires: ConsoleKit >= %{consolekit_version}
 Requires: PolicyKit >= %{policykit_version}
@@ -141,6 +143,7 @@
 %patch1 -p1 -b .direct
 %patch2 -p1 -b .priority
 %patch3 -p1 -b .keys
+%patch4 -p1 -b .dell-killswitch
 %patch7 -p1 -b .tablet-evdev
 %patch8 -p1 -b .fix-udev
 
@@ -293,6 +296,10 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Tue Mar 03 2009 - Bastien Nocera <bnocera at redhat.com> - 0.5.12-23.20090226git
+- Remove Dell killswitches support, they're handled through the kernel's
+  dell_laptop module instead now (#488177), removes requires for smbios-utils
+
 * Tue Mar 03 2009 Peter Hutterer <peter.hutterer at redhat.com>
 - purge hal-tablet.patch: fixed upstream in a different manner, see b0a2575f1.

More information about the fedora-extras-commits mailing list