rpms/em8300-kmod/devel .cvsignore, 1.3, 1.4 em8300-kmod.spec, 1.9, 1.10 sources, 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-serv12742/devel

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Log Message:
* Sat Nov 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.0.rc2
- 0.16.0-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2006 20:18:24 -0000	1.3
+++ .cvsignore	11 Nov 2006 09:32:39 -0000	1.4
@@ -1 +1 @@
-em8300-nofirmware-0.16.0-rc1.tar.bz2
+em8300-nofirmware-0.16.0-rc2.tar.bz2


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- em8300-kmod.spec	17 Oct 2006 19:08:18 -0000	1.9
+++ em8300-kmod.spec	11 Nov 2006 09:32:39 -0000	1.10
@@ -27,15 +27,15 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.0
-Release:        0.3.rc1.%(echo %{kverrel} | tr - _)
+Release:        0.3.rc2.%(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-rc1.tar.gz
+# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc2.tar.gz
 # with modules/em8300.uc removed
-Source0:        %{kmod_name}-nofirmware-%{version}-rc1.tar.bz2
+Source0:        %{kmod_name}-nofirmware-%{version}-rc2.tar.bz2
 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 +49,13 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc1
+cd %{kmod_name}-%{version}-rc2
 %patch0 -p0
 %patch1 -p0
-sed -i -e 's|<linux/config\.h>|<linux/autoconf.h>|' modules/*.[hc]
+sed -i -e '/<linux\/config\.h>/d' modules/em8300_main.c
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc1 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
 done
 
 
@@ -72,8 +72,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 for kvariant in %{kvariants} ; do
-    make -C _kmod_build_$kvariant/modules install DESTDIR=$RPM_BUILD_ROOT \
-        KERNVER=%{kverrel}$kvariant MODINST=extra/%{kmod_name}
+    cd _kmod_build_$kvariant/modules && \
+    make install DESTDIR=$RPM_BUILD_ROOT \
+        KERNVER=%{kverrel}$kvariant INSTALL_MOD_DIR=extra/%{kmod_name} && \
+    cd ../..
 done
 
 
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Sat Nov 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.0.rc2
+- 0.16.0-rc2.
+
 * Tue Oct 17 2006 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.18-1.2798.fc6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2006 20:18:24 -0000	1.3
+++ sources	11 Nov 2006 09:32:39 -0000	1.4
@@ -1 +1 @@
-969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
+b442b787026a262cdc3f74486302f43f  em8300-nofirmware-0.16.0-rc2.tar.bz2