rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.30,1.31 kmodtool,1.5,1.6

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	em8300-kmod.spec kmodtool 
Log Message:
* Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-0.2.rc3
- Don't build for PAE-debug (#227533).



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- em8300-kmod.spec	10 Aug 2007 09:13:23 -0000	1.30
+++ em8300-kmod.spec	10 Aug 2007 16:49:57 -0000	1.31
@@ -5,14 +5,13 @@
 
 # hardcode for now:
 %{!?kversion: %define kversion 2.6.22.1-32.fc6}
-# whether a workaround for #227533 is needed for this kernel:
-%define dash_hack env KMOD_DASH_HACK=1
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
 
 %ifarch i686
-%define pae PAE PAE-debug
+%define pae PAE
+#define pae PAE PAE-debug #227533
 %endif
 %ifarch ppc sparc64 alphaev56
 %define smp smp
@@ -32,7 +31,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.3
-Release:        0.1.rc3.%(echo %{kverrel} | tr - _)
+Release:        0.2.rc3.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPLv2+
@@ -50,7 +49,7 @@
 %description
 %{summary}.
 
-%{expand:%(%{?dash_hack} %{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
 
 %prep
 %setup -q -c
@@ -88,6 +87,9 @@
 
 
 %changelog
+* Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-0.2.rc3
+- Don't build for PAE-debug (#227533).
+
 * Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.3-0.1.rc3
 - 0.16.3-rc3 (for kernel 2.6.22+ support).
 - Build for kernel 2.6.22.1-32.fc6, adjust list of available kernel flavours.


Index: kmodtool
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/kmodtool,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kmodtool	31 May 2007 19:08:12 -0000	1.5
+++ kmodtool	10 Aug 2007 16:49:57 -0000	1.6
@@ -26,7 +26,7 @@
 shopt -s extglob
 
 myprog="kmodtool"
-myver="0.10.13x"
+myver="0.10.13"
 knownvariants=@(BOOT|PAE?(-debug)|@(big|huge)mem|debug|enterprise|kdump|?(large)smp?(-debug)|uml|xen?([0U])?(-PAE))
 kmod_name=
 kver=
@@ -68,9 +68,6 @@
         *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
         *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
     esac
-    if [ -n "$KMOD_DASH_HACK" ] ; then # workaround for #227533
-        kdep=${kdep//$verrel$variant/$verrel${variant//-/}}
-    fi
     cat <<EOF
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)