rpms/thinkpad-kmod/FC-5 kmodtool, 1.5, 1.6 thinkpad-kmod.spec, 1.9, 1.10
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun May 28 16:21:44 UTC 2006
- Previous message (by thread): rpms/python-xmpp/devel python-xmpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/lirc-kmod/devel kmodtool,1.6,1.7 lirc-kmod.spec,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/thinkpad-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21896/thinkpad-kmod/FC-5
Modified Files:
kmodtool thinkpad-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/thinkpad-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:21 -0000 1.5
+++ kmodtool 28 May 2006 16:21:44 -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: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- thinkpad-kmod.spec 15 May 2006 19:48:21 -0000 1.9
+++ thinkpad-kmod.spec 28 May 2006 16:21:44 -0000 1.10
@@ -1,9 +1,9 @@
# 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)
@@ -19,7 +19,7 @@
Name: %{kmod_name}-kmod
Summary: %{kmod_name} kernel modules
Version: 5.9
-Release: 6.%(echo %{kverrel} | tr - _)
+Release: 7.%(echo %{kverrel} | tr - _)
URL: http://tpctl.sourceforge.net/
Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz
@@ -65,6 +65,9 @@
%changelog
+* Sun May 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.9-7
+- Update kmodtool to 0.10.10, invoke it with bash instead of sh.
+
* Mon May 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.9-6
- Require version >= of thinkpad-kmod-common.
- Provide thinkpad-kmod instead of kmod-thinkpad to fix upgrade problems.
- Previous message (by thread): rpms/python-xmpp/devel python-xmpp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/lirc-kmod/devel kmodtool,1.6,1.7 lirc-kmod.spec,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list