From: Derrick Brashear Date: Thu, 18 Oct 2007 05:04:10 +0000 (+0000) Subject: DEVEL15-redhat-packaging-updates-20071018 X-Git-Tag: openafs-devel-1_5_26~19 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=706f0479793c3d22fbb3adf15b5e05ae08dce52e;p=packages%2Fo%2Fopenafs.git DEVEL15-redhat-packaging-updates-20071018 make the buildall script know centos and new fedora; make the spec file include it (cherry picked from commit bc1cc5a65b4096d8d489c1d20e0cb3a6f8b5b556) --- diff --git a/src/packaging/RedHat/openafs-buildall.sh b/src/packaging/RedHat/openafs-buildall.sh index 305405d4b..e87fc276b 100755 --- a/src/packaging/RedHat/openafs-buildall.sh +++ b/src/packaging/RedHat/openafs-buildall.sh @@ -21,10 +21,17 @@ buildopts= if [ `echo $rhrel | grep -c 'Fedora Core'` = 1 ] ; then ostype='fc' osrel=`echo $rhrel | sed -e 's/^.*release \([^ ]*\).*$/\1/' -e 's/\.//g'` +elif [ `echo $rhrel | grep -c 'Fedora'` = 1 ] ; then + ostype='fc' + osrel=`echo $rhrel | sed -e 's/^.*release \([^ ]*\).*$/\1/' -e 's/\.//g'` elif [ `echo $rhrel | grep -c 'Red Hat Enterprise Linux'` = 1 ] ; then ostype='rhel' excludearch=i586 osrel=`echo $rhrel | sed -e 's/^.*release \([^ ]*\).*$/\1/' -e 's/\.//g'` +elif [ `echo $rhrel | grep -c 'CentOS'` = 1 ] ; then + ostype='rhel' + excludearch=i586 + osrel=`echo $rhrel | sed -e 's/^.*release \([^ ]*\).*$/\1/' -e 's/\.//g'` elif [ `echo $rhrel | grep -c 'Red Hat Linux'` = 1 ] ; then ostype='rh' osrel=`echo $rhrel | sed -e 's/^.*release \([^ ]*\).*$/\1/' -e 's/\.//g'` diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 8d89f663b..47893a508 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -244,6 +244,7 @@ Source10: http://www.openafs.org/dl/openafs/%{afsvers}/RELNOTES-%{afsvers} Source11: http://www.openafs.org/dl/openafs/%{afsvers}/ChangeLog Source30: openafs-kernel-version.sh +Source998: openafs-buildall.sh Source999: kmodtool Patch0: openafs-1.4.0-kmodule26.patch