X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fpackaging%2FRedHat%2Fopenafs-kmodtool;h=b9ae6661bd403e54c2cb6feae1582512e459b3c2;hp=b136e25b19ab686950d8720fa7c5ce63f5977009;hb=837ec9dd41c4b1e10ad9d32a52b0f34dd665026a;hpb=397a086b77c4351e5332a73ae4859faf239bf45e diff --git a/src/packaging/RedHat/openafs-kmodtool b/src/packaging/RedHat/openafs-kmodtool index b136e25..b9ae666 100644 --- a/src/packaging/RedHat/openafs-kmodtool +++ b/src/packaging/RedHat/openafs-kmodtool @@ -40,10 +40,12 @@ get_verrel () verrel=${1:-$(uname -r)} verrel=${verrel%%$knownvariants} case "$verrel" in - *.el6.elrepo*) verrel="`echo ${verrel} | sed -e 's/^\(.*.el6.elrepo[^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; - *.el6*) verrel="`echo ${verrel} | sed -e 's/^\(.*.el6[^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; + *.el[6-9].elrepo*) + verrel="`echo ${verrel} | sed -e 's/^\(.*.el[6-9].elrepo[^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; + *.el[6-9]*) verrel="`echo ${verrel} | sed -e 's/^\(.*.el[6-9][^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; + *.fc[1-9][0-9]*) + verrel="`echo ${verrel} | sed -e 's/^\(.*.fc[1-9][0-9][^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; *.fc9*) verrel="`echo ${verrel} | sed -e 's/^\(.*.fc9[^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; - *.fc1?*) verrel="`echo ${verrel} | sed -e 's/^\(.*.fc1[0-9][^\.]*\)\.[^\.]\+.\?$/\1/'`" ;; esac } @@ -73,14 +75,19 @@ get_rpmtemplate () local variant="${1}" local dashvariant="${variant:+-${variant}}" case "$verrel" in - *.el6*) kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;; + *.el[6-9]*) + kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;; *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;; *) kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;; esac case "$verrel" in - *.el6*) kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; + *.el[6-9]*) + kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; + *.fc[2-9][0-9]*) + kname="${verrel}.%{_target_cpu}${variant:++${variant}}" ;; + *.fc1[0-9]*) + kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; *.fc9*) kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; - *.fc1?*) kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;; *) kname="${verrel}${variant}" ;; esac