rpms/lirc-kmod/FC-5 kmodtool,1.5,1.6 lirc-kmod.spec,1.8,1.9

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Sun May 28 2006 Ville Skyttä <ville.skytta at iki.fi>
- Update kmodtool to 0.10.10, invoke it with bash instead of sh.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/kmodtool,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kmodtool	15 May 2006 19:48:22 -0000	1.5
+++ kmodtool	28 May 2006 16:21:45 -0000	1.6
@@ -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.10"
+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}"
 }
 


Index: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lirc-kmod.spec	15 May 2006 19:48:22 -0000	1.8
+++ lirc-kmod.spec	28 May 2006 16:21:45 -0000	1.9
@@ -2,10 +2,10 @@
 
 # stuff to be implemented externally:
 Source10: kmodtool
-%define   kmodtool sh %{SOURCE10}
+%define   kmodtool bash %{SOURCE10}
 # end stuff to be ...
 
-%{?kversion: %define kversion 2.6.16-1.2111_FC5}
+%{?kversion: %define kversion 2.6.16-1.2122_FC5}
 
 %define kmod_name lirc
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -23,7 +23,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        7.%(echo %{kverrel} | tr - _)
+Release:        8.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Sun May 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-8
+- Update kmodtool to 0.10.10, invoke it with bash instead of sh.
+
 * Mon May 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-7
 - Require version >= of lirc-kmod-common.
 - Provide lirc-kmod instead of kmod-lirc to fix upgrade problems.