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

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Sat Jan 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-2
- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool	26 Jan 2006 22:35:23 -0000	1.1
+++ kmodtool	28 Jan 2006 12:50:41 -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: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc-kmod.spec	26 Jan 2006 22:35:23 -0000	1.1
+++ lirc-kmod.spec	28 Jan 2006 12:50:41 -0000	1.2
@@ -11,7 +11,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        1.%(echo %{kverrel} | tr - _)
+Release:        2.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-2
+- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.
+
 * Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-1
 - 0.8.0.
 - Hopefully fix lirc_{it87,serial,sir} on PPC, thanks to upstream.