rpms/em8300-kmod/devel em8300-kmod-0.16.3-2623.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 em8300-kmod.spec, 1.32, 1.33 sources, 1.12, 1.13

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore em8300-kmod.spec sources 
Added Files:
	em8300-kmod-0.16.3-2623.patch 
Log Message:
* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-5
- 0.16.3, build for kernel 2.6.23-0.115.rc3.git1.fc8.
- Fix build with recent 2.6.23 rc kernels.
- Use ExcludeArch instead of ExclusiveArch.
- License: GPLv2+


em8300-kmod-0.16.3-2623.patch:

--- NEW FILE em8300-kmod-0.16.3-2623.patch ---
Index: modules/em8300_ioctl.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl.c,v
retrieving revision 1.54
diff -u -r1.54 em8300_ioctl.c
--- modules/em8300_ioctl.c	2 Mar 2007 23:00:35 -0000	1.54
+++ modules/em8300_ioctl.c	21 Aug 2007 21:53:35 -0000
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/wait.h>
+#include <linux/ioctl.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
Index: modules/em8300_ioctl32.c
===================================================================
RCS file: /cvsroot/dxr3/em8300/modules/em8300_ioctl32.c,v
retrieving revision 1.5
diff -u -r1.5 em8300_ioctl32.c
--- modules/em8300_ioctl32.c	10 Apr 2006 22:31:14 -0000	1.5
+++ modules/em8300_ioctl32.c	21 Aug 2007 21:53:35 -0000
@@ -32,6 +32,7 @@
 #include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <linux/fs.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Jul 2007 21:38:28 -0000	1.12
+++ .cvsignore	21 Aug 2007 22:03:21 -0000	1.13
@@ -1 +1 @@
-em8300-nofirmware-0.16.3-rc2.tar.bz2
+em8300-nofirmware-0.16.3.tar.gz


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/em8300-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- em8300-kmod.spec	25 Jul 2007 18:06:45 -0000	1.32
+++ em8300-kmod.spec	21 Aug 2007 22:03:21 -0000	1.33
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.23-0.45.rc0.git16.fc8}
+%{!?kversion: %define kversion 2.6.23-0.115.rc3.git1.fc8}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -20,23 +20,22 @@
 %endif
 %{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?kdump}}
 
+%define prever  %{nil}
 
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.3
-Release:        0.6.rc2.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
-License:        GPL
+License:        GPLv2+
 URL:            http://dxr3.sourceforge.net/
-#Source0:        http://downloads.sourceforge.net/dxr3/%{kmod_name}-nofirmware-%{version}.tar.gz
-# Source0 is http://dxr3.sourceforge.net/download/em8300-0.16.3-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:         %{name}-0.16.3-2623.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch:  i686 x86_64 ppc ppc64
+ExcludeArch:    i386 i586
 
 %description
 %{summary}.
@@ -45,11 +44,12 @@
 
 %prep
 %setup -q -c
-cd %{kmod_name}-%{version}-rc2
+cd %{kmod_name}-%{version}%{?prever}
 %patch0 -p0
+%patch1 -p0
 cd ..
 for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-%{version}-rc2 _kmod_build_$kvariant
+    cp -a %{kmod_name}-%{version}%{?prever} _kmod_build_$kvariant
 done
 
 
@@ -78,6 +78,12 @@
 
 
 %changelog
+* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-5
+- 0.16.3, build for kernel 2.6.23-0.115.rc3.git1.fc8.
+- Fix build with recent 2.6.23 rc kernels.
+- Use ExcludeArch instead of ExclusiveArch.
+- License: GPLv2+
+
 * Wed Jul 25 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.23-0.45.rc0.git16.fc8.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 Jul 2007 21:38:28 -0000	1.12
+++ sources	21 Aug 2007 22:03:21 -0000	1.13
@@ -1 +1 @@
-f3f4073bc176cdc678002e053c357780  em8300-nofirmware-0.16.3-rc2.tar.bz2
+a2d208ba62639f9e3ab6c8dac2eb4565  em8300-nofirmware-0.16.3.tar.gz