spec file fix

diff --git a/ChangeLog b/ChangeLog
index 4c78652e2a8ff1367074d7a2b7bbb00874b86dc0..549c5bc9e6d4bfb33b7000ff1ae2c6fe946eec96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-26  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * Spec-file fix by Achim Settelmeier
+
 2003-03-10  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * Fix umount oops (found by Samuli Kärkkäinen)

diff --git a/fuse.spec b/fuse.spec
index eec3fa4b2ead6904b24d00cde3b75928e3f9a4c5..0dcd30bec89c18611373021213f1042b56837817 100644 (file)
--- 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 <fuse-rpm@sirlab.de>
+- don't add --with-kernel in case we compile for the standard kernel
+
 * Tue Mar 04 2003 Achim Settelmeier <fuse-rpm@sirlab.de>
 - "Merged" the specfile by Ian Pilcher (Ian Pilcher <pilchman@attbi.com>) 
   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 <fuse-rpm@sirlab.de>
 - Updated specfile for RedHat 8.0 systems
 
-