spec file changes

4 files changed, 42 insertions, 93 deletions

diff --git a/ChangeLog b/ChangeLog
index 9bc3d1e..84fa949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-05  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+	* Merge of fuse_redhat.spec and fuse.spec by Achim Settelmeier
+
 2003-03-04  Miklos Szeredi <mszeredi@inf.bme.hu>
 
 	* Updated fuse.spec file (Achim Settelmeier)
diff --git a/Makefile.am b/Makefile.am
index c8d2345..a7cf071 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,5 +3,4 @@
 SUBDIRS = @subdirs@
 
 EXTRA_DIST =			\
-	fuse.spec		\
-	fuse_redhat.spec
+	fuse.spec
diff --git a/fuse.spec b/fuse.spec
index 82bedf6..eec3fa4 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -2,10 +2,11 @@
 %define fusemoduledir /lib/modules/%{kernelversion}/kernel/fs/fuse
 
 %define kernelrel %(uname -r | sed -e s/-/_/)
+%define real_release 4
 
 Name: fuse
 Version: 1.0
-Release: kernel_%{kernelrel}_3
+Release: kernel_%{kernelrel}_%{real_release}
 Summary: Filesystem in Userspace
 Source: %{name}-%{version}.tar.gz
 Copyright: GPL
@@ -14,6 +15,13 @@ URL: http://sourceforge.net/projects/avf
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: /usr
 Packager: Achim Settelmeier <fuse-rpm@sirlab.de>
+# some parts of this specfile are taken from Ian Pilcher's specfile
+
+# don't restrict to RedHat kernels but also allow compilation with 
+# vanilla kernels, too.
+#Requires: kernel = %{kernelrel}, redhat-release >= 7
+#BuildRequires: kernel-source = %{kernelrel}
+
 
 %description
 FUSE (Filesystem in Userspace) is a simple interface for userspace
@@ -35,6 +43,13 @@ case "$RPM_BUILD_ROOT" in *-root) rm -rf $RPM_BUILD_ROOT ;; esac
 make
 make check
 
+## Now build the library as a shared object
+#cd lib
+#gcc -fPIC -DHAVE_CONFIG_H -I../include -Wall -W -g -O2 -c *.c
+#gcc -shared -Wl,-soname,libfuse.so.%{major_ver} -o libfuse.so.%{version} *.o
+#cd ..
+
+
 %install
 case "$RPM_BUILD_ROOT" in *-root) rm -rf $RPM_BUILD_ROOT ;; esac
 make install \
@@ -50,15 +65,21 @@ make -C example clean
 rm -rf example/.deps/
 
 %post
-/sbin/depmod -a
+/sbin/depmod -aq
+
+%preun
+/sbin/modprobe -r fuse
 
 %postun
-/sbin/depmod -a
+/sbin/depmod -aq
+
+
 
 %files
 %defattr(-,root,root)
 %doc README TODO NEWS INSTALL ChangeLog AUTHORS COPYING COPYING.LIB
-%doc example/
+%doc example/ 
+%doc patch/
 
 %{fusemoduledir}
 %{prefix}/lib/libfuse.a
@@ -70,3 +91,15 @@ rm -rf example/.deps/
 #%attr(4500,root,root) %{prefix}/bin/fusermount
 %{prefix}/bin/fusermount
 
+
+
+%changelog
+
+* 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.
+
+* Mon Mar 03 2003 Achim Settelmeier <fuse-rpm@sirlab.de>
+- Updated specfile for RedHat 8.0 systems
+
+
diff --git a/fuse_redhat.spec b/fuse_redhat.spec
deleted file mode 100644
index f2959cd..0000000
--- a/fuse_redhat.spec
+++ /dev/null
@@ -1,87 +0,0 @@
-%define major_ver   0
-%define minor_ver   95
-
-%define spec_ver    1
-
-%define kver %(rpm -q --queryformat %{VERSION} kernel)
-%define krel %(rpm -q --queryformat %{RELEASE} kernel)
-%define kverrel %{kver}-%{krel}
-
-Name: fuse
-Summary: Filesystem in USErspace
-Version: %{major_ver}.%{minor_ver}
-Release: %{spec_ver}
-Source: http://prdownloads.sourceforge.net/avf/fuse-%{version}.tar.gz
-URL: http://sourceforge.net/projects/avf
-License: GPL
-Group: System Environment/Kernel
-Vendor: Miklos Szeredi <mszeredi@users.sourceforge.net>
-Packager: Ian Pilcher <pilchman@attbi.com>
-Requires: kernel = %{kverrel}, redhat-release >= 7
-BuildRequires: kernel-source = %{kverrel}
-BuildRoot: /var/tmp/fuser-%{version}
-
-%description
-FUSE (Filesystem in USErspace) is a simple interface for userspace
-programs to export a virtual filesystem to the linux kernel.  FUSE
-also aims to provide a secure method for non privileged users to
-create and mount their own filesystem implementations.
-
-%prep
-%setup
-
-%build
-./configure --with-kernel=/usr/src/linux-%{kverrel}
-make
-# Now build the library as a shared object
-cd lib
-gcc -fPIC -DHAVE_CONFIG_H -I../include -Wall -W -g -O2 -c *.c
-gcc -shared -Wl,-soname,libfuse.so.%{major_ver} -o libfuse.so.%{version} *.o
-cd ..
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/include/
-cp include/fuse.h $RPM_BUILD_ROOT/usr/include/
-mkdir -p $RPM_BUILD_ROOT/lib/modules/fuse/
-cp kernel/fuse.o $RPM_BUILD_ROOT/lib/modules/fuse/
-mkdir -p $RPM_BUILD_ROOT/usr/lib/
-cp lib/libfuse.a lib/libfuse.so.%{version} $RPM_BUILD_ROOT/usr/lib/
-ln -s libfuse.so.%{version} $RPM_BUILD_ROOT/usr/lib/libfuse.so
-mkdir -p $RPM_BUILD_ROOT/sbin/
-cp util/fusermount $RPM_BUILD_ROOT/sbin/
-
-%files
-%attr(0644,root,root) /usr/include/fuse.h
-%attr(0644,root,root) /lib/modules/fuse/fuse.o
-%attr(0644,root,root) /usr/lib/libfuse.a
-%attr(0755,root,root) /usr/lib/libfuse.so*
-%attr(0744,root,root) /sbin/fusermount
-%doc AUTHORS ChangeLog NEWS README TODO example/ patch/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-for a in /lib/modules/%{kverrel}*; do
-    mkdir $a/kernel/fs/fuse
-    ln -s /lib/modules/fuse/fuse.o $a/kernel/fs/fuse/fuse.o
-done
-/sbin/ldconfig
-/sbin/depmod -aq
-
-%preun
-/sbin/modprobe -r fuse
-for a in /lib/modules/%{kverrel}*; do
-    rm -rf $a/kernel/fs/fuse
-done
-
-%postun
-/sbin/ldconfig
-/sbin/depmod -aq
-
-%changelog
-
-* Wed Feb 27 2002 Ian Pilcher <pilchman@attbi.com>
-- initial SPEC file
-