From 08028745bc88c4a5c55776419342e877a276ae46 Mon Sep 17 00:00:00 2001 From: Dave Botsch Date: Thu, 1 Mar 2012 12:43:36 -0500 Subject: [PATCH] Fixes dkms.conf for Redhat Enterprise commit 8e0aaae076f4cccfd2d6ed81ede4e355235b578e , while fixing dkms.conf for Fedora, broke dkms.conf for RHEL. In RHEL, you get a dkms.conf with too many backslashes in the "mv" line. The dkms.conf should have the mv line reading: mv src/libafs/MODLOAD-*/\$KMODNAME \$DSTKMOD" for Fedora. This change checks if we are building on Fedora, and if so, maintains the extra backslashes. Otherwise, not. modified: src/packaging/RedHat/openafs.spec.in Uses the dist tags as specified at http://fedoraproject.org/wiki/Packaging:DistTag Reviewed-on: http://gerrit.openafs.org/6851 Reviewed-by: Ken Dreyer Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 81a9a33e0bc5455841ba105dab52735c64c7096b) Change-Id: I7b1e09700d9b17e6616be71ab9dd8bc0a760996d Reviewed-on: http://gerrit.openafs.org/6862 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/packaging/RedHat/openafs.spec.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 2a8e7213a..876c4ceb7 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -1055,6 +1055,8 @@ install -p -m 644 src/packaging/RedHat/openafs-cacheinfo $uve/cacheinfo install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/src cp -a libafs_tree $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{dkms_version} +%if 0%{?fedora} + cat > $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{dkms_version}/dkms.conf < $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{dkms_version}/dkms.conf <