rpms/em8300-kmod/FC-6 em8300-kmod.spec,1.27,1.28 kmodtool,1.4,1.5

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	em8300-kmod.spec kmodtool 
Log Message:
* Thu May 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.2-2
- Apply ugly, hopefully temporary workaround for #227533.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/em8300-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- em8300-kmod.spec	30 May 2007 20:00:09 -0000	1.27
+++ em8300-kmod.spec	31 May 2007 19:08:12 -0000	1.28
@@ -5,6 +5,8 @@
 
 # hardcode for now:
 %{!?kversion: %define kversion 2.6.20-1.2952.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)
@@ -28,7 +30,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.16.2
-Release:        1.%(echo %{kverrel} | tr - _)
+Release:        2.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -43,7 +45,7 @@
 %description
 %{summary}.
 
-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
+%{expand:%(%{?dash_hack} %{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
 
 %prep
 %setup -q -c
@@ -81,6 +83,9 @@
 
 
 %changelog
+* Thu May 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.16.2-2
+- Apply fugly, hopefully temporary workaround for #227533.
+
 * Wed May 30 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Rebuild for kernel 2.6.20-1.2952.fc6.
 


Index: kmodtool
===================================================================
RCS file: /cvs/pkgs/rpms/em8300-kmod/FC-6/kmodtool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmodtool	15 Mar 2007 09:27:39 -0000	1.4
+++ kmodtool	31 May 2007 19:08:12 -0000	1.5
@@ -26,7 +26,7 @@
 shopt -s extglob
 
 myprog="kmodtool"
-myver="0.10.13"
+myver="0.10.13x"
 knownvariants=@(BOOT|PAE?(-debug)|@(big|huge)mem|debug|enterprise|kdump|?(large)smp?(-debug)|uml|xen?([0U])?(-PAE))
 kmod_name=
 kver=
@@ -68,6 +68,9 @@
         *.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)