rpms/em8300-kmod/devel em8300-kmod.spec,1.3,1.4

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	em8300-kmod.spec 
Log Message:
* Sat Sep 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.2.rc1
- Fix install location when built against 2.6.18-rc*.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- em8300-kmod.spec	15 Sep 2006 20:18:24 -0000	1.3
+++ em8300-kmod.spec	16 Sep 2006 10:53:26 -0000	1.4
@@ -27,7 +27,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.1.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.2.rc1.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -60,9 +60,10 @@
 
 %build
 for kvariant in %{kvariants} ; do
+    kv=%{kverrel}$kvariant
     ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant/modules && \
-    make %{?_smp_mflags} V=1 KERNEL_LOCATION=$ks && \
+    make %{?_smp_mflags} V=1 KERNVER=$kv KERNEL_LOCATION=$ks && \
     cd ../..
 done
 
@@ -70,9 +71,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
     make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNEL_LOCATION=$ks MODINST=extra/%{kmod_name}
+        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
 done
 
 
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Sep 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.2.rc1
+- Fix install location when built against 2.6.18-rc*.
+
 * Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.1.rc1
 - 0.16.0-rc1, kernel 2.6.17 patch applied upstream.
 - Patch to default to OSS for backwards compatibility.