From c4efbccdeb8e76bd3bb448b6c7f2e32d3149291bb12b1080355fbb54a57071ab Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 4 Jul 2007 21:14:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fuse?expand=0&rev=8 --- boot.fuse | 2 -- fuse-pc-remove-libdir-from-Libs.diff | 9 ++++++ fuse.changes | 5 +++ fuse.spec | 48 +++++++++++++++++++--------- 4 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 fuse-pc-remove-libdir-from-Libs.diff diff --git a/boot.fuse b/boot.fuse index 1c4bb7d..a419bf6 100644 --- a/boot.fuse +++ b/boot.fuse @@ -15,8 +15,6 @@ PATH="/sbin:/bin" MOUNTPOINT=/sys/fs/fuse/connections -test -x /usr/bin/fusermount || exit 5 - . /etc/rc.status case "$1" in diff --git a/fuse-pc-remove-libdir-from-Libs.diff b/fuse-pc-remove-libdir-from-Libs.diff new file mode 100644 index 0000000..4154a4f --- /dev/null +++ b/fuse-pc-remove-libdir-from-Libs.diff @@ -0,0 +1,9 @@ +--- fuse.pc.in ++++ fuse.pc.in +@@ -6,5 +6,5 @@ + Name: fuse + Description: Filesystem in Userspace + Version: @VERSION@ +-Libs: -L${libdir} -lfuse @libfuse_libs@ ++Libs: -lfuse @libfuse_libs@ + Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64 diff --git a/fuse.changes b/fuse.changes index 113b6a8..e75eb1b 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 3 12:44:37 CEST 2007 - bk@suse.de + +- move libs and programs to /lib and /bin, recommended for ntfs-3g + ------------------------------------------------------------------- Mon Jun 18 16:52:34 CEST 2007 - dmueller@suse.de diff --git a/fuse.spec b/fuse.spec index 0d85c99..8fe941a 100644 --- a/fuse.spec +++ b/fuse.spec @@ -13,21 +13,30 @@ Name: fuse Summary: Userspace File System Version: 2.6.5 -Release: 14 -License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Release: 16 +License: GPL v2 or later, LGPL v2 or later Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 Source1: boot.fuse Patch: fuse-install-fix.diff +Patch2: fuse-pc-remove-libdir-from-Libs.diff URL: http://fuse.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq permissions +%define _exec_prefix / +%define _libdir /%_lib +%define usrbindir %{_prefix}/bin +%define pkgconfigdir %{_prefix}/%{_lib}/pkgconfig %description With FUSE, a userspace program can export a file system through the Linux kernel. -To use fuse, you need an additional fuse module, like sshfs. +To use fuse, you additional fuse modules like curlftpfs, encfs, obexfs, +sshfs or wdfs. + +These and possibly more are likely provided as separate packages in +this distribution. @@ -36,15 +45,14 @@ Authors: Miklos Szeredi %package devel -Summary: user space filesystem -Group: System/Filesystems +Summary: Development package for of FUSE (userspace filesystem) modules +Group: Development/Languages/C and C++ Requires: fuse = %{version} glibc-devel %description devel -With FUSE a userspace program can export a filesystem through the Linux -kernel. - -To use fuse you need an additional fuse module, like fuse_kio. +This package contains all include files, libraries and configuration +files needed to develop programs that use FUSE library to implement +Linux filesystems in userspace. @@ -55,12 +63,15 @@ Authors: %prep %setup -q %patch -%{?suse_update_config:%{suse_update_config -f}} +%if "%{_exec_prefix}" == "/" || "%{_exec_prefix}" == "/usr" +%patch2 +%endif %build autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ + --with-pkgconfigdir=%pkgconfigdir \ --disable-kernel-module \ --enable-lib \ --enable-util \ @@ -71,6 +82,11 @@ make make DESTDIR="$RPM_BUILD_ROOT" install rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d install -m755 -D %{S:1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/boot.fuse +cd %buildroot +rm -rf .%{_libdir}/lib*.la +mv .%{_libdir}/lib*.a .%{_prefix}/%{_lib}/ +mkdir .%{usrbindir} +mv .%{_bindir}/fusermount .%{usrbindir}/fusermount %post %{insserv_force_if_yast boot.fuse} @@ -78,7 +94,7 @@ install -m755 -D %{S:1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/boot.fuse %run_permissions %verifyscript -%verify_permissions -e %{_bindir}/fusermount +%verify_permissions -e %{usrbindir}/fusermount %preun %stop_on_removal boot.fuse @@ -93,22 +109,24 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %config %{_sysconfdir}/init.d/boot.fuse -%doc AUTHORS COPYING* ChangeLog FAQ NEWS README* +%doc AUTHORS ChangeLog FAQ NEWS README* %{_libdir}/lib*.so.* -%verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount +%verify(not mode) %attr(4750,root,trusted) %{usrbindir}/fusermount /sbin/mount.fuse %{_bindir}/ulockmgr_server %files devel %defattr(-,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.*a +%{_prefix}/%{_lib}/lib*.a %{_includedir}/fuse.h %{_includedir}/fuse %{_includedir}/ulockmgr.h -%{_libdir}/pkgconfig/*.pc +%{pkgconfigdir}/*.pc %changelog +* Tue Jul 03 2007 - bk@suse.de +- move libs and programs to /lib and /bin, recommended for ntfs-3g * Mon Jun 18 2007 - dmueller@suse.de - fix boot.fuse to start after boot.localfs * Fri May 04 2007 - mszeredi@suse.de