rpms/thinkpad-kmod/devel thinkpad-kmod-5.9-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 thinkpad-kmod.spec, 1.2, 1.3 thinkpad-kmod-2615pm.patch, 1.1, NONE thinkpad-kmod-percpu.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007

Modified Files:
	.cvsignore sources thinkpad-kmod.spec 
Added Files:
	thinkpad-kmod-5.9-build.patch 
Removed Files:
	thinkpad-kmod-2615pm.patch thinkpad-kmod-percpu.patch 
Log Message:
* Sat Feb 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.9-1
- 5.9.


thinkpad-kmod-5.9-build.patch:

--- NEW FILE thinkpad-kmod-5.9-build.patch ---
--- thinkpad-5.9/2.6/drivers/Makefile~	2005-12-22 14:23:16.000000000 +0200
+++ thinkpad-5.9/2.6/drivers/Makefile	2006-02-25 17:41:12.000000000 +0200
@@ -7,7 +7,7 @@
 endif
 
 ifndef EXTRA_CFLAGS
-EXTRA_CFLAGS := -Wall -Wcast-align -Wstrict-prototypes -O2 -DLINUX -I$(SUBDIRS)/../include
+EXTRA_CFLAGS := -Wall -Wcast-align -Wstrict-prototypes -DLINUX -I$(SUBDIRS)/../include
 endif
 
 obj-m		:= thinkpad.o smapi.o superio.o rtcmosram.o
@@ -28,10 +28,9 @@
 
 install:
 	if [ ! -d $(MODULESROOT)/thinkpad ]; then mkdir -p -m 755 $(MODULESROOT)/thinkpad ; fi
-	install -m 444 -o 0 -g 0 thinkpad.ko   $(MODULESROOT)/thinkpad/thinkpad.ko
-	install -m 444 -o 0 -g 0 smapi.ko      $(MODULESROOT)/thinkpad/smapi.ko
-	install -m 444 -o 0 -g 0 superio.ko    $(MODULESROOT)/thinkpad/superio.ko
-	install -m 444 -o 0 -g 0 rtcmosram.ko  $(MODULESROOT)/thinkpad/rtcmosram.ko
-	depmod -a
+	install -m 744 thinkpad.ko   $(MODULESROOT)/thinkpad/thinkpad.ko
+	install -m 744 smapi.ko      $(MODULESROOT)/thinkpad/smapi.ko
+	install -m 744 superio.ko    $(MODULESROOT)/thinkpad/superio.ko
+	install -m 744 rtcmosram.ko  $(MODULESROOT)/thinkpad/rtcmosram.ko
 
 .PHONY: default clean install


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jan 2006 22:21:45 -0000	1.2
+++ .cvsignore	2 Mar 2006 21:37:24 -0000	1.3
@@ -1 +1 @@
-thinkpad_5.8.tar.gz
+thinkpad-5.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2006 22:21:45 -0000	1.2
+++ sources	2 Mar 2006 21:37:24 -0000	1.3
@@ -1 +1 @@
-288ab19587bb3a8a4d6097448059b4c6  thinkpad_5.8.tar.gz
+9cd4e86277bb7baeca97e93f57f49e87  thinkpad-5.9.tar.gz


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thinkpad-kmod.spec	28 Jan 2006 12:51:08 -0000	1.2
+++ thinkpad-kmod.spec	2 Mar 2006 21:37:24 -0000	1.3
@@ -9,13 +9,12 @@
 
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
-Version:        5.8
-Release:        10.%(echo %{kverrel} | tr - _)
+Version:        5.9
+Release:        1.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
-Source0:        http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz
-Patch0:		%{name}-percpu.patch
-Patch1:         %{name}-2615pm.patch
+Source0:        http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz
+Patch0:         %{name}-5.9-build.patch
 License:        GPL
 Group:          System Environment/Kernel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,12 +34,8 @@
 #sleep 5
 
 %setup -q -T -c -a 0
-cd %{kmod_name}-%{version}
-%{__perl} -pi -e 's|-O2\s+||' 2.6/drivers/Makefile
-sed -i 's|depmod -a|echo depmod -a disabled|' 2.6/drivers/Makefile
 %patch0 -p0
-%patch1 -p0
-cd ..
+sed -i /enable_thinkpadpm/d %{kmod_name}-%{version}/2.6/drivers/thinkpad.c
 for kvariant in %{kvariants} ; do
     cp -a %{kmod_name}-%{version}* _kmod_build_$kvariant
 done
@@ -59,7 +54,6 @@
     make -C _kmod_build_$kvariant/2.6/drivers install \
         MODULESROOT=$RPM_BUILD_ROOT/lib/modules/%{kverrel}$kvariant/extra
 done
-chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*
 
 
 %clean
@@ -67,6 +61,9 @@
 
 
 %changelog
+* Sat Feb 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.9-1
+- 5.9.
+
 * Sat Jan 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.8-10
 - Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.
 


--- thinkpad-kmod-2615pm.patch DELETED ---


--- thinkpad-kmod-percpu.patch DELETED ---