diff --git a/fuse.changes b/fuse.changes index 25e5ba3..0974b89 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 10 13:41:37 CEST 2007 - bk@suse.de + +- branch off libfuse2 to avoid having to start fuse on boot (#285101) +- Add "Supplements: filesystem(fuse)" in case someone looks for fuse +- libulockmgr and ulockmgr_server are separate from fuse (#285101) + ------------------------------------------------------------------- Fri Jul 13 18:19:50 CEST 2007 - mszeredi@suse.de diff --git a/fuse.spec b/fuse.spec index a6514fd..cf2a5d2 100644 --- a/fuse.spec +++ b/fuse.spec @@ -11,9 +11,9 @@ # norootforbuild Name: fuse -Summary: Userspace File System +Summary: User space File System Version: 2.7.0 -Release: 4 +Release: 10 License: GPL any version; LGPL any version Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 @@ -24,6 +24,7 @@ URL: http://fuse.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: licenses BuildRequires: licenses +Supplements: filesystem(fuse) PreReq: %insserv_prereq permissions %define _exec_prefix / %define _libdir /%_lib @@ -32,11 +33,11 @@ PreReq: %insserv_prereq permissions %define pkgconfigdir %{_prefix}/%{_lib}/pkgconfig %description -With FUSE, a userspace program can export a file system through the +With FUSE, a user space program can export a file system through the kernel-default (Linux kernel). -Userspace filesystems which are implemented using FUSE are provided by -the following packages: +User space file systems which are implemented using FUSE are provided +by the following packages: - curlftpfs (mount FTP servers), @@ -58,8 +59,56 @@ the following packages: - wdfs (mount of WebDAV shares) -After installing fuse-devel, admins can compile and install other -userspace filesystems which can be found at +This package contains the mount binaries for fuse (might not be needed +by some FUSE filesystems like ntfs-3g) and the documentation for FUSE. + +After installing fuse-devel, administrators can compile and install +other user space file systems which can be found at +http://fuse.sourceforge.net/wiki + + + +Authors: +-------- + Miklos Szeredi + +%package -n libfuse2 +Summary: Library of FUSE, the User space File System for GNU/Linux and BSD +Group: System/Filesystems + +%description -n libfuse2 +With FUSE, a user space program can export a file system through the +kernel-default (Linux kernel). + +A FUSE file system which only needs libfuse2 is ntfs-3g, other FUSE +file systems might need the fuse package in addition to have fusermount +and /sbin/mount.fuse. + +User space file systems which are implemented using FUSE are provided +by the following packages: + +- curlftpfs (mount FTP servers), + +- encfs (layered file encryption), + +- fuseiso (mount iso, img, bin, mdf and nrg CD-ROM images), + +- fusepod (mount iPods), + +- fusesmb (mount a fully browseable network neighborhood), + +- gphotofs (mount gphoto-supported cameras), + +- ntfs-3g (mount NTFS volumes read-write), + +- obexfs (mount of bluetooth devices), + +- sshfs (mount over ssh), + +- wdfs (mount of WebDAV shares) + +After installing fuse-devel, administrators can compile and install +other user space file systems which can be found at http://fuse.sourceforge.net/wiki @@ -71,14 +120,14 @@ Authors: %package devel Summary: Development package for FUSE (userspace filesystem) modules Group: Development/Languages/C and C++ -Requires: fuse = %{version} glibc-devel +Requires: fuse = %{version} libfuse2 = %{version} glibc-devel %description devel This package contains all include files, libraries and configuration files needed to develop programs that use the fuse (FUSE) library to -implement kernel-default (Linux) filesystems in userspace. +implement kernel-default (Linux) file systems in user space. -Many userspace filesystems are already provided as packages for +Many user space file systems are already provided as packages for installation: - curlftpfs (mount FTP servers), @@ -101,8 +150,9 @@ installation: - wdfs (mount of WebDAV shares) -With fuse-devel, admins can compile and install other userspace -filesystems which can be found at http://fuse.sourceforge.net/wiki +With fuse-devel, administrators can compile and install other user +space file systems which can be found at +http://fuse.sourceforge.net/wiki @@ -141,7 +191,8 @@ mv .%{_libdir}/lib*.*a .%{devlibdir} rm .%{_libdir}/lib*.so # recreate these pointing upwards: cd .%{devlibdir} ln -s ../../lib*/libfuse.so.*.*.* libfuse.so -ln -s ../../lib*/libulockmgr.so.*.*.* libulockmgr.so +#not needed for fuse, might reappar in separate package: +#ln -s ../../lib*/libulockmgr.so.*.*.* libulockmgr.so cd - mkdir .%{usrbindir} mv .%{_bindir}/fusermount .%{usrbindir}/fusermount @@ -152,7 +203,6 @@ ln -s ../licenses/LGPL-2.0.txt COPYING.LIB %post %{insserv_force_if_yast boot.fuse} -%run_ldconfig %run_permissions %verifyscript @@ -165,6 +215,12 @@ ln -s ../licenses/LGPL-2.0.txt COPYING.LIB %run_ldconfig %insserv_cleanup +%post -n libfuse2 +%run_ldconfig + +%postun -n libfuse2 +%run_ldconfig + %clean rm -rf $RPM_BUILD_ROOT @@ -173,7 +229,6 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/init.d/boot.fuse %doc AUTHORS ChangeLog FAQ NEWS README* %{_docdir}/COPYING* -%{_libdir}/lib*.so.* %if %suse_version <= 1020 %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d @@ -181,17 +236,29 @@ rm -rf $RPM_BUILD_ROOT %endif %verify(not mode) %attr(4750,root,trusted) %{usrbindir}/fusermount /sbin/mount.fuse -%{_bindir}/ulockmgr_server +# not needed for fuse, might reappar in separate package: +%exclude %{_bindir}/ulockmgr_server +%exclude %{_libdir}/libulockmgr.so.* + +%files -n libfuse2 +%defattr(-,root,root) +%{_libdir}/libfuse.so.* %files devel %defattr(-,root,root) -%{devlibdir}/lib*.* +%{devlibdir}/libfuse.* %{_includedir}/fuse.h %{_includedir}/fuse -%{_includedir}/ulockmgr.h %{pkgconfigdir}/*.pc +# not needed for fuse, might reappar in separate package: +%exclude %{_includedir}/ulockmgr.h +%exclude %{devlibdir}/libulockmgr.* %changelog +* Fri Aug 10 2007 - bk@suse.de +- branch off libfuse2 to avoid having to start fuse on boot (#285101) +- Add "Supplements: filesystem(fuse)" in case someone looks for fuse +- libulockmgr and ulockmgr_server are separate from fuse (#285101) * Fri Jul 13 2007 - mszeredi@suse.de - conditionally add udev rule if building with 10.2 or earlier * Thu Jul 05 2007 - bk@suse.de diff --git a/rpmlintrc b/rpmlintrc new file mode 100644 index 0000000..b904743 --- /dev/null +++ b/rpmlintrc @@ -0,0 +1,24 @@ +# This line is mandatory to access the configuration functions +from Config import * + +# rpmlint message: +# Your package contains a /etc/init.d scrip") +# a start dependency that is not behind $remote_fs, while it apparently +# needs $remote_fs dependency due to files being packaged under /usr. +# +# /usr/bin/fusermount is only needed when normal users want to mount, +# otherwise everything else is outside of /usr, so it can be localfs: +# +addFilter("fuse non-remote_fs-dependency") + +# rpmlint message: +# The init script name should be the same as the package name in lower case, +# one with 'd' appended if it invokes a process by that name. +# +# /etc/init.d/boot.fuse is fine, no daemon is started, just a module is +# loaded (and udev creates the device) and a kernel filesystem is mounted: +# +addFilter("fuse incoherent-init-script-name") + +# Everything moved away, so it got small but the docs are not huge: +addFilter("fuse package-with-huge-docs")