rpms/thinkpad-kmod/devel kmodtool, 1.1, 1.2 thinkpad-kmod.spec, 1.1, 1.2

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
* 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.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool	26 Jan 2006 22:21:45 -0000	1.1
+++ kmodtool	28 Jan 2006 12:51:08 -0000	1.2
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.3"
+myver="0.10.4"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
 kmod_name=
 kver=
@@ -59,13 +59,17 @@
 {
     local variant="${1}"
     local dashvariant="${variant:+-${variant}}"
+    case "$verrel" in
+        *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
+        *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
+    esac
     cat <<EOF
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
 Provides:         kernel-module = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{version}-%{release}
-Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
+Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thinkpad-kmod.spec	26 Jan 2006 22:21:45 -0000	1.1
+++ thinkpad-kmod.spec	28 Jan 2006 12:51:08 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.8
-Release:        9.%(echo %{kverrel} | tr - _)
+Release:        10.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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.
+
 * Fri Jan 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.8-9
 - Remove "up" == "" support, related cleanups.