From 21c282b55f0bce38e23e85dda2b2d377d3c9fc67 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 26 May 2003 07:12:57 +0000 Subject: [PATCH] spec file fix --- ChangeLog | 4 ++++ fuse.spec | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c78652..549c5bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-05-26 Miklos Szeredi + + * Spec-file fix by Achim Settelmeier + 2003-03-10 Miklos Szeredi * Fix umount oops (found by Samuli Kärkkäinen) diff --git a/fuse.spec b/fuse.spec index eec3fa4..0dcd30b 100644 --- a/fuse.spec +++ b/fuse.spec @@ -2,7 +2,7 @@ %define fusemoduledir /lib/modules/%{kernelversion}/kernel/fs/fuse %define kernelrel %(uname -r | sed -e s/-/_/) -%define real_release 4 +%define real_release 5 Name: fuse Version: 1.0 @@ -37,9 +37,15 @@ case "$RPM_BUILD_ROOT" in *-root) rm -rf $RPM_BUILD_ROOT ;; esac %setup %build +# invoke configure with the --with-kernel option in case we attempt to +# compile for a different kernel and hope the path is right :-) +if [ "%{kernelversion}" != $(uname -r) ]; then + WITH_KERNEL="--with-kernel=/usr/src/linux-%{kernelversion}" +fi + ./configure \ - --with-kernel=/usr/src/linux-%{kernelversion}\ - --prefix=%{prefix} + --prefix=%{prefix} \ + $WITH_KERNEL make make check @@ -95,6 +101,9 @@ rm -rf example/.deps/ %changelog +* Sun May 25 2003 Achim Settelmeier +- don't add --with-kernel in case we compile for the standard kernel + * Tue Mar 04 2003 Achim Settelmeier - "Merged" the specfile by Ian Pilcher (Ian Pilcher ) and this specfile into one. Both are provided by fuse-1.0.tar.gz. @@ -102,4 +111,3 @@ rm -rf example/.deps/ * Mon Mar 03 2003 Achim Settelmeier - Updated specfile for RedHat 8.0 systems - -- 2.30.2