X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fpackaging%2FRedHat%2Fopenafs-kmodtool;h=88d10b2c507c11c61acbefe94124b69edab81a81;hp=8451b357777c6058a029a9184a4124b105b11b8a;hb=c20c01185ed748b2bc823369a8f28cf004b7d1c9;hpb=cddc732ec5fd40c94126e5f0b7103136592a2efe

diff --git a/src/packaging/RedHat/openafs-kmodtool b/src/packaging/RedHat/openafs-kmodtool
index 8451b35..88d10b2 100644
--- a/src/packaging/RedHat/openafs-kmodtool
+++ b/src/packaging/RedHat/openafs-kmodtool
@@ -83,7 +83,9 @@ get_rpmtemplate ()
     case "$verrel" in
         *.el[6-9]*)
 	          kname="${verrel}.%{_target_cpu}${variant:+.${variant}}" ;;
-        *.fc[1-9][0-9]*)
+        *.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}}" ;;
         *)        kname="${verrel}${variant}"                             ;;
@@ -98,17 +100,17 @@ Provides:         ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:         openafs-kernel = %{PACKAGE_VERSION}
 Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version}
-Requires(post):   /sbin/depmod
-Requires(postun): /sbin/depmod
+Requires(post):   ${depmod}
+Requires(postun): ${depmod}
 Release:          %{pkgrel}.%(echo ${verrel} | tr - _)
 BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
 %description   -n kmod-${kmod_name}${dashvariant}
 This package provides the ${kmod_name} kernel modules built for the Linux
 kernel ${kname} for the %{_target_cpu} family of processors.
 %post          -n kmod-${kmod_name}${dashvariant}
-/sbin/depmod -aeF /boot/System.map-${kname} ${kname} > /dev/null || :
+${depmod} -aeF /boot/System.map-${kname} ${kname} > /dev/null || :
 %postun        -n kmod-${kmod_name}${dashvariant}
-/sbin/depmod -aF /boot/System.map-${kname} ${kname} &> /dev/null || :
+${depmod} -aF /boot/System.map-${kname} ${kname} &> /dev/null || :
 %files         -n kmod-${kmod_name}${dashvariant}
 %defattr(644,root,root,755)
 /lib/modules/${kname}/extra/${kmod_name}/
@@ -123,12 +125,17 @@ print_rpmtemplate ()
   kver="${1}"
   get_verrel "${1}"
   shift
+  depmod="${1}"
+  shift
   if [ -z "${kmod_name}" ] ; then
     echo "Please provide the kmodule-name as first parameter." >&2
     exit 2
   elif [ -z "${kver}" ] ; then
     echo "Please provide the kver as second parameter." >&2
     exit 2
+  elif [ -z "${depmod}" ] ; then
+    echo "Please provide the full path to depmod as third parameter." >&2
+    exit 2
   elif [ -z "${verrel}" ] ; then
     echo "Couldn't find out the verrel." >&2
     exit 2
@@ -150,7 +157,7 @@ Usage: ${myprog} <command> <option>+
     - Get "base" version-release.
   variant <uname>                               
     - Get variant from uname.
-  rpmtemplate <mainpgkname> <uname> <variants> 
+  rpmtemplate <mainpgkname> <uname> </path/to/depmod> <variants> 
     - Return a template for
   version  
     - Output version number and exit.