rpms/em8300-kmod/FC-5 .cvsignore, 1.4, 1.5 em8300-kmod.spec, 1.8, 1.9 sources, 1.4, 1.5

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Mon Dec 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-1
- 0.16.0, build for kernel 2.6.18-1.2257.fc5.
- Let rpmbuild strip modules.
- Build i586 SMP modules too.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2006 09:27:14 -0000	1.4
+++ .cvsignore	18 Dec 2006 20:57:32 -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-5/em8300-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- em8300-kmod.spec	11 Nov 2006 09:46:35 -0000	1.8
+++ em8300-kmod.spec	18 Dec 2006 20:57:32 -0000	1.9
@@ -4,12 +4,12 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.18-1.2239.fc5}
+%{!?kversion: %define kversion 2.6.18-1.2257.fc5}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
 
-%ifarch i686 ppc
+%ifarch i586 i686 ppc
 %define smp smp
 %endif
 %ifarch i686 x86_64
@@ -22,15 +22,12 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.0.rc2.%(echo %{kverrel} | tr - _)
+Release:        1.%(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)
@@ -44,13 +41,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
 
 
@@ -58,9 +54,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
 
 
@@ -69,11 +64,10 @@
 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
 
 
 %clean
@@ -81,6 +75,11 @@
 
 
 %changelog
+* Mon Dec 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-1
+- 0.16.0, build for kernel 2.6.18-1.2257.fc5.
+- Let rpmbuild strip modules.
+- Build i586 SMP modules too.
+
 * Sat Nov 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.0.rc2
 - 0.16.0-rc2, build for kernel 2.6.18-1.2239.fc5.
 


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