rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.21,1.22 kmodtool,1.3,1.4

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	em8300-kmod.spec kmodtool 
Log Message:
* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-2
- Build for kernel 2.6.20-1.2925.fc6 and adjust variants for it
  (add PAE-debug for i686, debug for i686 and x86_64, disable xen).
- Update kmodtool to 0.10.13.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- em8300-kmod.spec	5 Mar 2007 21:42:45 -0000	1.21
+++ em8300-kmod.spec	15 Mar 2007 09:27:39 -0000	1.22
@@ -4,30 +4,32 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.19-1.2911.6.5.fc6}
+%{!?kversion: %define kversion 2.6.20-1.2925.fc6}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
 
 %ifarch i686
-%define pae PAE
+%define pae PAE PAE-debug
 %endif
-%ifarch ppc
+%ifarch ppc sparc64
 %define smp smp
 %endif
-%ifarch i686 x86_64 ia64
-%define xen xen
+%ifarch i686 x86_64
+# xen disabled in 2.6.20-1.2925.fc6
+#define xen xen
+%define dbg debug
 %endif
 %ifarch i686 x86_64 ppc64 ppc64iseries
 %define kdump kdump
 %endif
-%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump}}
+%{!?kvariants: %define kvariants "" %{?pae} %{?smp} %{?xen} %{?kdump} %{?dbg}}
 
 
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.1
-Release:        1.%(echo %{kverrel} | tr - _)
+Release:        2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -80,6 +82,11 @@
 
 
 %changelog
+* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.1-2
+- Build for kernel 2.6.20-1.2925.fc6 and adjust variants for it
+  (add PAE-debug for i686, debug for i686 and x86_64, disable xen).
+- Update kmodtool to 0.10.13.
+
 * Mon Mar  5 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.19-1.2911.6.5.fc6.
 


Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-6/kmodtool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmodtool	1 Mar 2007 16:43:23 -0000	1.3
+++ kmodtool	15 Mar 2007 09:27:39 -0000	1.4
@@ -26,8 +26,8 @@
 shopt -s extglob
 
 myprog="kmodtool"
-myver="0.10.12"
-knownvariants=@(BOOT|PAE?(-debug)|@(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=