rpms/em8300-kmod/FC-5 .cvsignore, 1.5, 1.6 em8300-kmod.spec, 1.13, 1.14 kmodtool, 1.2, 1.3 sources, 1.5, 1.6

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore em8300-kmod.spec kmodtool sources 
Log Message:
* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-0.1
- 0.16.1, kmodtool 0.10.13.
- Build for kernel 2.6.20-1.2300.fc5 and adjust variants for it
  (add smp-debug for i686, debug for i686 and x86_64, disable xen).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Dec 2006 20:57:32 -0000	1.5
+++ .cvsignore	15 Mar 2007 10:10:41 -0000	1.6
@@ -1 +1 @@
-em8300-nofirmware-0.16.0.tar.gz
+em8300-nofirmware-0.16.1.tar.gz


Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- em8300-kmod.spec	6 Mar 2007 18:12:46 -0000	1.13
+++ em8300-kmod.spec	15 Mar 2007 10:10:41 -0000	1.14
@@ -4,25 +4,30 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.19-1.2288.2.4.fc5}
+%{!?kversion: %define kversion 2.6.20-1.2300.fc5}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
 
-%ifarch i586 i686 ppc
+%ifarch i586 ppc
 %define smp smp
 %endif
+%ifarch i686
+%define smp smp smp-debug
+%endif
 %ifarch i686 x86_64
-%define xen xen xen0
+# xen disabled in 2.6.20-1.2300.fc5
+#define xen xen xen0
 %define kdump kdump
+%define dbg debug
 %endif
-%{!?kvariants: %define kvariants "" %{?smp} %{?xen} %{?kdump}}
+%{!?kvariants: %define kvariants "" %{?smp} %{?xen} %{?kdump} %{?dbg}}
 
 
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
-Version:        0.16.0
-Release:        1.%(echo %{kverrel} | tr - _)
+Version:        0.16.1
+Release:        0.%(echo %{kverrel} | tr - _).1
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -75,6 +80,11 @@
 
 
 %changelog
+* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-0.1
+- 0.16.1, kmodtool 0.10.13.
+- Build for kernel 2.6.20-1.2300.fc5 and adjust variants for it
+  (add smp-debug for i686, debug for i686 and x86_64, disable xen).
+
 * Tue Mar  6 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.19-1.2288.2.4.fc5.
 


Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/kmodtool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmodtool	10 Aug 2006 18:14:55 -0000	1.2
+++ kmodtool	15 Mar 2007 10:10:41 -0000	1.3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # kmodtool - Helper script for building kernel module RPMs
-# Copyright (c) 2003-2006 Ville Skyttä <ville.skytta at iki.fi>,
+# Copyright (c) 2003-2007 Ville Skyttä <ville.skytta at iki.fi>,
 #                         Thorsten Leemhuis <fedora at leemhuis.info>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -26,8 +26,8 @@
 shopt -s extglob
 
 myprog="kmodtool"
-myver="0.10.11"
-knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE))
+myver="0.10.13"
+knownvariants=@(BOOT|PAE?(-debug)|@(big|huge)mem|debug|enterprise|kdump|?(large)smp?(-debug)|uml|xen?([0U])?(-PAE))
 kmod_name=
 kver=
 verrel=


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Dec 2006 20:57:32 -0000	1.5
+++ sources	15 Mar 2007 10:10:41 -0000	1.6
@@ -1 +1 @@
-61a3405d31e260d9159d189f649e5d48  em8300-nofirmware-0.16.0.tar.gz
+c1e2db38fa3e3cf28b43dd304aaa2961  em8300-nofirmware-0.16.1.tar.gz