From af941bb77ddf5a82c8ae6c874655e2132f116740af0385e33d0a6e155ad2d47c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 23 Apr 2009 21:46:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fuse?expand=0&rev=19 --- fuse-2.7.2.tar.bz2 | 3 -- fuse-2.7.4.tar.bz2 | 3 ++ fuse.changes | 9 ++++ fuse.spec | 109 ++++++++++++++++++++++++++++++++------------- 4 files changed, 89 insertions(+), 35 deletions(-) delete mode 100644 fuse-2.7.2.tar.bz2 create mode 100644 fuse-2.7.4.tar.bz2 diff --git a/fuse-2.7.2.tar.bz2 b/fuse-2.7.2.tar.bz2 deleted file mode 100644 index aead3ad..0000000 --- a/fuse-2.7.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71e83a5f7f4ee6495978aed9e4d2791285d717979e9e4fe65060c9e1c62b4281 -size 393306 diff --git a/fuse-2.7.4.tar.bz2 b/fuse-2.7.4.tar.bz2 new file mode 100644 index 0000000..8df9f8e --- /dev/null +++ b/fuse-2.7.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71df51aff3fd120a9ea78bfb4cd13446930ab65269d970d52c5b4079d13660e0 +size 394019 diff --git a/fuse.changes b/fuse.changes index 46e5e80..f27bed8 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 22 01:25:59 CEST 2009 - crrodriguez@suse.de + +- remove static libraries and "la" files +- spec file cleanup +- update to version 2.7.4 +* Fix missing pthread_mutex_destroy in error path of + fuse_lib_opendir(). Patch by Szabolcs Szakacsits + ------------------------------------------------------------------- Fri Apr 3 14:33:13 CEST 2009 - coolo@suse.de diff --git a/fuse.spec b/fuse.spec index a45f87f..3cafe28 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,5 +1,5 @@ # -# spec file for package fuse (Version 2.7.2) +# spec file for package fuse (Version 2.7.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: fuse Summary: User space File System -Version: 2.7.2 -Release: 62 +Version: 2.7.4 +Release: 1 License: GPL v2 or later; LGPL v2.1 or later Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 @@ -35,11 +35,6 @@ Requires: licenses BuildRequires: licenses Supplements: filesystem(fuse) PreReq: %insserv_prereq permissions -%define _exec_prefix / -%define _libdir /%_lib -%define usrbindir %{_prefix}/bin -%define devlibdir %{_prefix}/%{_lib} -%define pkgconfigdir %{_prefix}/%{_lib}/pkgconfig %description With FUSE, a user space program can export a file system through the @@ -167,6 +162,51 @@ http://fuse.sourceforge.net/wiki +Authors: +-------- + Miklos Szeredi + +%package devel-static +License: GPL v2 or later; LGPL v2.1 or later +Summary: Development package for FUSE (userspace filesystem) modules +Group: Development/Languages/C and C++ +Requires: fuse-devel = %{version} +Provides: fuse-devel:%{_libdir}/libfuse.a + +%description devel-static +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) file systems in user space. + +Many user space file systems are already provided as packages for +installation: + +- 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) + +With 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 @@ -181,13 +221,15 @@ Authors: %build autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure \ - --with-pkgconfigdir=%pkgconfigdir \ +%configure --with-pic \ + --with-pkgconfigdir=%{_libdir}/pkgconfig \ + --exec-prefix=/ \ + --libdir=/%{_lib} \ --disable-kernel-module \ --enable-lib \ --enable-util \ --enable-example -make +%{__make} %{?jobs:-j%jobs} %install make DESTDIR="$RPM_BUILD_ROOT" install @@ -199,16 +241,12 @@ ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING.LIB | sed 's/ .*//') COPYING %if %suse_version <= 1020 install -m644 -D util/udev.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/99-fuse.rules %endif -cd %buildroot -mv .%{_libdir}/lib*.*a .%{devlibdir} -rm .%{_libdir}/lib*.so # recreate these pointing upwards: -cd .%{devlibdir} -ln -s ../../lib*/libfuse.so.*.*.* libfuse.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 +for libname in libfuse libulockmgr;do +%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/$libname.so) %{buildroot}%{_libdir}/$libname.so +%{__rm} -v %{buildroot}/%{_lib}/$libname.{so,la} +%{__mv} -v %{buildroot}/%{_lib}/$libname.a %{buildroot}%{_libdir} +done +%{__rm} -f %{buildroot}%{_libdir}/*.la %post %{insserv_force_if_yast boot.fuse} @@ -222,14 +260,11 @@ if ! test -f /.buildenv ; then fi %postun -%run_ldconfig %insserv_cleanup -%post -n libfuse2 -%run_ldconfig +%post -n libfuse2 -p /sbin/ldconfig -%postun -n libfuse2 -%run_ldconfig +%postun -n libfuse2 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -243,27 +278,37 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/udev/rules.d %{_sysconfdir}/udev/rules.d/99-fuse.rules %endif -%verify(not mode) %attr(4750,root,trusted) %{usrbindir}/fusermount +%verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount /sbin/mount.fuse # not needed for fuse, might reappar in separate package: %exclude %{_bindir}/ulockmgr_server -%exclude %{_libdir}/libulockmgr.so.* +%exclude /%{_lib}/libulockmgr.so.* %files -n libfuse2 %defattr(-,root,root) -%{_libdir}/libfuse.so.* +/%{_lib}/libfuse.so.2* %files devel %defattr(-,root,root) -%{devlibdir}/libfuse.* +%{_libdir}/libfuse.so %{_includedir}/fuse.h %{_includedir}/fuse -%{pkgconfigdir}/*.pc +%{_libdir}/pkgconfig/*.pc # not needed for fuse, might reappar in separate package: %exclude %{_includedir}/ulockmgr.h -%exclude %{devlibdir}/libulockmgr.* +%exclude %{_libdir}/libulockmgr.* + +%files devel-static +%defattr(-,root,root) +%{_libdir}/libfuse.a %changelog +* Wed Apr 22 2009 crrodriguez@suse.de +- remove static libraries and "la" files +- spec file cleanup +- update to version 2.7.4 + * Fix missing pthread_mutex_destroy in error path of + fuse_lib_opendir(). Patch by Szabolcs Szakacsits * Fri Apr 03 2009 coolo@suse.de - adding baselibs.conf to build -xxbit * Mon Dec 01 2008 ro@suse.de