rpms/i8kutils/FC-4 i8kbuttons.init,1.4,1.5 i8kutils.spec,1.7,1.8

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/i8kutils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv897/FC-4

Modified Files:
	i8kbuttons.init i8kutils.spec 
Log Message:
Requires tk (#188199) and sync all FC-4+ branches.



Index: i8kbuttons.init
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kbuttons.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- i8kbuttons.init	16 Aug 2005 12:42:33 -0000	1.4
+++ i8kbuttons.init	7 Apr 2006 13:36:21 -0000	1.5
@@ -1,16 +1,16 @@
 #!/bin/bash
 #
-# i8kbuttons       Make the multimedia buttons (volume up/down, mute)
-#                  on dell inspiron work
+# i8kbuttons   Make the multimedia buttons (volume up/down, mute) on Dell
+#              Inspiron laptops work
 #
 # chkconfig: 2345 10 90
-# description: Make the multimedia buttons (volume up/down, mute) on dell
-#              inspiron work
+# description: Make the multimedia buttons (volume up/down, mute) on Dell \
+#              Inspiron laptops work
 #
 # ChangeLog: 2003/9/9 Jeremy Brand <jeremy at nirvani.net>
 # - Amount of 8 was quite dynamic, changed to 4.
 # - Also added PCM changes in addition to master volume.
-# 
+#
 
 # Source function library.
 . /etc/init.d/functions
@@ -23,26 +23,26 @@
 # See how we were called.
 case "$1" in
   start)
-        echo -n $"Starting $prog: "
-	/sbin/modprobe i8k force=1
+	echo -n $"Starting $prog: "
+	/sbin/modprobe i8k force=1 &>/dev/null
 	if pidofproc $prog &>/dev/null; then
 		echo_failure
 		RETVAL=1
 	else
 		$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
+		touch /var/lock/subsys/$prog
 		RETVAL=0
 	fi
 	echo
-        ;;
+	;;
   stop)
-        echo -n $"Shutting down $prog: "
+	echo -n $"Shutting down $prog: "
 	killproc $prog
 	RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-        ;;
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+	;;
   status)
 	status $prog
 	RETVAL=$?
@@ -53,8 +53,8 @@
 	RETVAL=$?
 	;;
   *)
-        echo $"Usage: $0 {start|stop|restart|reload|status}"
-        exit 1
+	echo $"Usage: $0 {start|stop|restart|reload|status}"
+	exit 1
 esac
 
 exit $RETVAL


Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kutils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- i8kutils.spec	16 Aug 2005 12:42:33 -0000	1.7
+++ i8kutils.spec	7 Apr 2006 13:36:21 -0000	1.8
@@ -1,9 +1,10 @@
+# http://www.coding-zone.com/?page=i8krellm
 %define gkrellmpluginver 2.5
 
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 4%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -11,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0
+Requires: alsa-utils, gkrellm >= 2.0.0, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -52,7 +53,7 @@
     %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/
 popd
 
-%{__install} -D -m 755 %{SOURCE2} \
+%{__install} -D -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons
 
 
@@ -82,6 +83,16 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- Add tk requirement, since the included i8kmon utility requires it.
+
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- FC5 rebuild.
+- Silence possible kernel module insertion error in the init script.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 1.25-5
+- Rebuild for new gcc/glibc.
+
 * 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.