rpms/em8300-kmod/FC-6 .cvsignore, 1.4, 1.5 em8300-kmod.spec, 1.14, 1.15 sources, 1.4, 1.5

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/em8300-kmod/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32622

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Mon Dec 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-5
- 0.16.0, build for kernel 2.6.18-1.2868.fc6.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2006 09:32:38 -0000	1.4
+++ .cvsignore	18 Dec 2006 20:37:43 -0000	1.5
@@ -1 +1 @@
-em8300-nofirmware-0.16.0-rc2.tar.bz2
+em8300-nofirmware-0.16.0.tar.gz


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- em8300-kmod.spec	12 Nov 2006 19:43:05 -0000	1.14
+++ em8300-kmod.spec	18 Dec 2006 20:37:43 -0000	1.15
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2849.fc6}
+%{!?kversion: %define kversion 2.6.18-1.2868.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -27,15 +27,12 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.4.rc2.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
-#Source0:        http://dl.sf.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
-# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc2.tar.gz
-# with modules/em8300.uc removed
-Source0:        %{kmod_name}-nofirmware-%{version}-rc2.tar.bz2
+Source0:        http://downloads.sourceforge.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 Patch1:         http://cachalot.mine.nu/src/dxr3/em8300-oss-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,13 +46,12 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc2
+cd %{kmod_name}-%{version}
 %patch0 -p0
 %patch1 -p0
-sed -i -e '/<linux\/config\.h>/d' modules/em8300_main.c
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version} _kmod_build_$kvariant
 done
 
 
@@ -63,9 +59,8 @@
 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 KERNVER=$kv KERNEL_LOCATION=$ks && \
-    cd ../..
+    make %{?_smp_mflags} -C _kmod_build_$kvariant/modules \
+        V=1 KERNVER=$kv KERNEL_LOCATION=$ks
 done
 
 
@@ -74,10 +69,8 @@
 for kvariant in %{kvariants} ; do
     kv=%{kverrel}$kvariant
     ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
-    cd _kmod_build_$kvariant/modules && \
-    make install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name} && \
-    cd ../..
+    make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
+        KERNVER=$kv KERNEL_LOCATION=$ks INSTALL_MOD_DIR=extra/%{kmod_name}
 done
 chmod +x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*.ko
 
@@ -87,6 +80,9 @@
 
 
 %changelog
+* Mon Dec 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-5
+- 0.16.0, build for kernel 2.6.18-1.2868.fc6.
+
 * Sun Nov 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.4.rc2
 - Let rpmbuild strip modules.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2006 09:32:38 -0000	1.4
+++ sources	18 Dec 2006 20:37:43 -0000	1.5
@@ -1 +1 @@
-b442b787026a262cdc3f74486302f43f  em8300-nofirmware-0.16.0-rc2.tar.bz2
+61a3405d31e260d9159d189f649e5d48  em8300-nofirmware-0.16.0.tar.gz