rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.2,1.3 kmodtool,1.1,1.2

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	em8300-kmod.spec kmodtool 
Log Message:
* Thu Aug 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.3-7
- Rebuild for kernel 2.6.17_1.2174_FC5.
- Update kmodtool to 0.10.11.



Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/em8300-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- em8300-kmod.spec	22 Jul 2006 20:20:34 -0000	1.2
+++ em8300-kmod.spec	10 Aug 2006 18:14:55 -0000	1.3
@@ -4,7 +4,7 @@
 # end stuff to be ...
 
 # hardcode for now:
-%{!?kversion: %define kversion 2.6.17-1.2157_FC5}
+%{!?kversion: %define kversion 2.6.17-1.2174_FC5}
 
 %define kmod_name em8300
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -23,7 +23,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
 Version:        0.15.3
-Release:        6.%(echo %{kverrel} | tr - _)
+Release:        7.%(echo %{kverrel} | tr - _)
 
 Group:          System Environment/Kernel
 License:        GPL
@@ -61,7 +61,7 @@
     make %{?_smp_mflags} V=1 KERNEL_LOCATION=$ks && \
     cd ../..
 done
-    
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,6 +77,10 @@
 
 
 %changelog
+* Thu Aug 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.3-7
+- Rebuild for kernel 2.6.17_1.2174_FC5.
+- Update kmodtool to 0.10.11.
+
 * Tue Jul 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.15.3-6
 - Enable PPC SMP builds (#189400).
 - Use firmwareless tarball (#189400).


Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/em8300-kmod/FC-5/kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool	22 Jul 2006 20:16:26 -0000	1.1
+++ kmodtool	10 Aug 2006 18:14:55 -0000	1.2
@@ -23,9 +23,11 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+shopt -s extglob
+
 myprog="kmodtool"
-myver="0.10.9"
-knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
+myver="0.10.11"
+knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen?([0U])?(-PAE))
 kmod_name=
 kver=
 verrel=
@@ -33,24 +35,27 @@
 
 get_verrel ()
 {
-  verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')"
+  verrel=${1:-$(uname -r)}
+  verrel=${verrel%%$knownvariants}
 }
 
 print_verrel ()
 {
-  get_verrel $@ || return $?
+  get_verrel $@
   echo "${verrel}"
 }
 
 get_variant ()
 {
-  variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')"
-  [ "${variant}" != "${1-$(uname -r)}" ] || variant='""'
+  get_verrel $@
+  variant=${1:-$(uname -r)}
+  variant=${variant##$verrel}
+  variant=${variant:-'""'}
 }
 
 print_variant ()
 {
-  get_variant $@ || return $?
+  get_variant $@
   echo "${variant}"
 }