rpms/i8kutils/devel i8kbuttons.init,1.3,1.4 i8kutils.spec,1.6,1.7

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/i8kutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21170/devel

Modified Files:
	i8kbuttons.init i8kutils.spec 
Log Message:
Enhancements and fixes.



Index: i8kbuttons.init
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/devel/i8kbuttons.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- i8kbuttons.init	16 Nov 2004 17:50:53 -0000	1.3
+++ i8kbuttons.init	16 Aug 2005 12:42:33 -0000	1.4
@@ -16,25 +16,23 @@
 . /etc/init.d/functions
 
 prog=i8kbuttons
-aumix=/usr/bin/aumix
-amount=4
+amixer=/usr/bin/amixer
+amount="10%"
 
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-# Original
-# 	OPTIONS="--up '$aumix -v +$amount' --down '$aumix -v -$amount' --mute '$aumix -v 0'"
-	OPTIONS="--up '$aumix -v +$amount; $aumix -w +$amount' --down '$aumix -v -$amount; $aumix -w -$amount' --mute '$aumix -v 0; $aumix -w 0'"
         echo -n $"Starting $prog: "
-	/sbin/modprobe i8k
-	/sbin/initlog $INITLOG_ARGS -c "$prog $OPTIONS" &
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ]; then
-	    success
-	    touch /var/lock/subsys/$prog
+	/sbin/modprobe i8k force=1
+	if pidofproc $prog &>/dev/null; then
+		echo_failure
+		RETVAL=1
 	else
-	    failure
+		$prog --up "$amixer -q set Master $amount+" --down "$amixer -q set Master $amount-" --mute "$amixer -q set Master 0" &
+		echo_success
+	    	touch /var/lock/subsys/$prog
+		RETVAL=0
 	fi
 	echo
         ;;


Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- i8kutils.spec	6 Apr 2005 22:12:02 -0000	1.6
+++ i8kutils.spec	16 Aug 2005 12:42:33 -0000	1.7
@@ -1,12 +1,9 @@
-# $Id$
-
 %define gkrellmpluginver 2.5
 
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 3
-
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -14,12 +11,10 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: gkrellm >= 2.0.0
+Requires: alsa-utils, gkrellm >= 2.0.0
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
-# Stock Red Hat / Fedora gkrellm-devel should require these
-BuildRequires: gtk2-devel, pkgconfig
 # This package is only relevant on Dell laptops, thus i386 only
 ExclusiveArch: i386
 
@@ -30,8 +25,6 @@
 for example cooling fans and volume buttons.
 
 Also provided is a cool and useful plugin for gkrellm.
-Note that you need the "Inspiron 8000" option compiled into your kernel
-(included in the main kernel tree since 2.4.14-pre8).
 
 
 %prep
@@ -59,7 +52,8 @@
     %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/
 popd
 
-%{__install} -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/i8kbuttons
+%{__install} -D -m 755 %{SOURCE2} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons
 
 
 %post
@@ -67,7 +61,7 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service i8kbuttons stop >/dev/null 2>&1
+    /sbin/service i8kbuttons stop &>/dev/null
     /sbin/chkconfig --del i8kbuttons
 fi
 
@@ -81,14 +75,26 @@
 %doc README.i8kutils i8kmon.conf
 %doc i8krellm-%{gkrellmpluginver}/AUTHORS i8krellm-%{gkrellmpluginver}/README
 %doc i8krellm-%{gkrellmpluginver}/Changelog
-%{_initrddir}/i8kbuttons
+%{_sysconfdir}/rc.d/init.d/i8kbuttons
 %{_bindir}/*
 %{_libdir}/gkrellm2/plugins/*
 %{_mandir}/man1/*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 1.25-4
+- Fix init script to use amixer instead of no longer provided aumix (#165555).
+- Fix init script to not use obsolete initlog anymore.
+- Use force=1 argument to i8k kernel module since many recent laptops (i.e. my
+  Inspiron 8600) aren't recognized by the module, but can use it nevertheless
+  to control the fans and get the Dell service tag.
+- Disable the init script, which is only useful with the Dell specific buttons,
+  by default for the above reason (my media keys work fine with ACME/GNOME).
+- Remove obsolete description bit.
+- Remove obsolete build requires missing from old gkrellm-devel packages.
+- Add alsa-utils requirement for amixer.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.25-3
 - rebuilt
 
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 1.25-2