fuse.spec updated

diff --git a/ChangeLog b/ChangeLog
index 88263c98e9de5fcd9b6431797d6fc93395e59b6c..9bc3d1e4c6e5c7416ccea838d926183fb1485ef7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-04  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * Updated fuse.spec file (Achim Settelmeier)
+
 2003-02-19  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * Version 1.0 released

diff --git a/fuse.spec b/fuse.spec
index bf782ea83535f2053312b1cd424d87cc98482c2e..82bedf6f97adb6a4337c2e172346d4d6d24340c1 100644 (file)
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,9 +1,11 @@
 %define kernelversion %(uname -r)
 %define fusemoduledir /lib/modules/%{kernelversion}/kernel/fs/fuse
 
+%define kernelrel %(uname -r | sed -e s/-/_/)
+
 Name: fuse
 Version: 1.0
-Release: 1
+Release: kernel_%{kernelrel}_3
 Summary: Filesystem in Userspace
 Source: %{name}-%{version}.tar.gz
 Copyright: GPL
@@ -11,7 +13,7 @@ Group: Utilities/System
 URL: http://sourceforge.net/projects/avf
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: /usr
-Packager: Achim Settelmeier <settel@sirlab.de>
+Packager: Achim Settelmeier <fuse-rpm@sirlab.de>
 
 %description
 FUSE (Filesystem in Userspace) is a simple interface for userspace
@@ -25,13 +27,13 @@ case "$RPM_BUILD_ROOT" in *-root) rm -rf $RPM_BUILD_ROOT ;; esac
 
 %prep
 %setup
-%patch -p1
 
 %build
 ./configure \
        --with-kernel=/usr/src/linux-%{kernelversion}\
        --prefix=%{prefix}
 make
+make check
 
 %install
 case "$RPM_BUILD_ROOT" in *-root) rm -rf $RPM_BUILD_ROOT ;; esac
@@ -39,10 +41,13 @@ make install \
        prefix=$RPM_BUILD_ROOT%{prefix} \
        fusemoduledir=$RPM_BUILD_ROOT%{fusemoduledir}
 
+install -d $RPM_BUILD_ROOT%{prefix}/lib/fuse/example
+install -s -m 755 example/{fusexmp,hello,null} $RPM_BUILD_ROOT%{prefix}/lib/fuse/example/
+
 # remove binaries form example folder so we can include it 
 # as a form of documentation into the package
 make -C example clean
-
+rm -rf example/.deps/
 
 %post
 /sbin/depmod -a
@@ -52,14 +57,16 @@ make -C example clean
 
 %files
 %defattr(-,root,root)
-%doc README TODO NEWS INSTALL ChangeLog AUTHORS COPYING
+%doc README TODO NEWS INSTALL ChangeLog AUTHORS COPYING COPYING.LIB
 %doc example/
 
 %{fusemoduledir}
 %{prefix}/lib/libfuse.a
 %{prefix}/include/fuse.h
+%{prefix}/lib/fuse/
 
 # you want to install fusermount SUID root? 
 # Then uncomment the "%attr()"-line in favour of the line after it.
 #%attr(4500,root,root) %{prefix}/bin/fusermount
 %{prefix}/bin/fusermount
+