diff --git a/fuse.changes b/fuse.changes index f27bed8..1be99af 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 30 10:30:41 CEST 2009 - aj@suse.de + +- Fix exclude usage. + ------------------------------------------------------------------- Wed Apr 22 01:25:59 CEST 2009 - crrodriguez@suse.de diff --git a/fuse.spec b/fuse.spec index 3cafe28..944def7 100644 --- a/fuse.spec +++ b/fuse.spec @@ -21,8 +21,8 @@ Name: fuse Summary: User space File System Version: 2.7.4 -Release: 1 -License: GPL v2 or later; LGPL v2.1 or later +Release: 2 +License: GPL v2 or later ; LGPL v2.1 or later Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 Source1: boot.fuse @@ -77,7 +77,7 @@ Authors: Miklos Szeredi %package -n libfuse2 -License: GPL v2 or later; LGPL v2.1 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Library of FUSE, the User space File System for GNU/Linux and BSD Group: System/Filesystems @@ -123,7 +123,7 @@ Authors: Miklos Szeredi %package devel -License: GPL v2 or later; LGPL v2.1 or later +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 = %{version} libfuse2 = %{version} glibc-devel @@ -167,7 +167,7 @@ Authors: Miklos Szeredi %package devel-static -License: GPL v2 or later; LGPL v2.1 or later +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} @@ -247,6 +247,11 @@ for libname in libfuse libulockmgr;do %{__mv} -v %{buildroot}/%{_lib}/$libname.a %{buildroot}%{_libdir} done %{__rm} -f %{buildroot}%{_libdir}/*.la +# not needed for fuse, might reappar in separate package: +%{__rm} -f %{buildroot}/%{_bindir}/ulockmgr_server +%{__rm} -f %{buildroot}/%{_libdir}/libulockmgr.* +%{__rm} -f %{buildroot}/%{_lib}/libulockmgr.so.* +%{__rm} -f %{buildroot}/%{_includedir}/ulockmgr.h %post %{insserv_force_if_yast boot.fuse} @@ -280,9 +285,6 @@ rm -rf $RPM_BUILD_ROOT %endif %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 /%{_lib}/libulockmgr.so.* %files -n libfuse2 %defattr(-,root,root) @@ -294,137 +296,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/fuse.h %{_includedir}/fuse %{_libdir}/pkgconfig/*.pc -# not needed for fuse, might reappar in separate package: -%exclude %{_includedir}/ulockmgr.h -%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 -- check for /.buildenv before stop_on_removal -* Mon Dec 17 2007 mszeredi@suse.de -- Update to version 2.7.2 - * Fix a symbol versioning mistake - * Fix a deadlock on termination, if umount is synchronous - * Fix umounting if /etc/mtab is a symlink -* Fri Nov 23 2007 mszeredi@suse.de -- Update to version 2.7.1 - * Add missing context initialization in fuse_fs_chmod() - * Fix a fuse_req leak in do_forget() - * Work around hotplug issue - * Reset args->argc in fuse_opt_free_args() -* Sun Sep 02 2007 aj@suse.de -- Fix building. -- Rename rpmlintrc to fuse.rpmlintrc and add it as source. -* Fri Aug 31 2007 mszeredi@suse.de -- fix location of COPYING files (#306681) -* 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 -- update to new major release 2.7.0: - * Support for stacking filesystem modules - * New module for converting filename character sets - * "setuid=USER" allows to do "su - USER" for the filesystem - * fs subtype has been added to libfuse and the mount commands - * Several problems have been addressed, e.g. mount.fuse is rewritten - the multithreaded loop uses a semaphore instead of signals, - improved locking and O_APPEND is fixed in direct IO mode -* 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 -- fix build error -* Wed May 02 2007 mszeredi@suse.de -- updated to version 2.6.5 - * mount.fuse script fixes - * fix exiting on umount for filesystems which block SIGHUP -- udev rule for fuse device is now in udev package -- don't remove fuse module in the init-script -- use 'fusectl' as the filesystem source -* Fri Feb 09 2007 ro@suse.de -- change fillup_and_insserv to insserv_force_if_yast in post-script - (there is no sysconfig file involved here) -* Wed Feb 07 2007 mszeredi@suse.cz -- added init script which loads the fuse module and mounts the control - filesystem (#223663) -* Mon Feb 05 2007 mszeredi@suse.cz -- updated to version 2.6.3: - * fix regression causing an abort during heavy filesystem use - * update author's email -* Tue Jan 30 2007 tiwai@suse.de -- updated to version 2.6.2: - * fix 64bit compile problems - * fix fuse_teardown problem - * fix unaligned access in file descriptor in libfuse - * fix detection of fuseblk - * fix use after free in fuse_flush - * fix compatible API for opts == NULL -* Thu Jan 18 2007 tiwai@suse.de -- fix compat API (#233870) -* Tue Dec 19 2006 tiwai@suse.de -- updated to version 2.6.1: - * improved fusermout help texts - * fix automake problems -* Mon Oct 23 2006 cthiel@suse.de -- update to version 2.6.0 - * Improved read characteristics (asynchronous reads) - * Support for aborting filesystem connection - * POSIX file locking support - * Request interruption support - * Building module for Linux kernels earlier than 2.6.9 not supported - * Allow block device based filesystems to support swap files - * Several bugs fixed, including a rare system hang on SMP -* Mon Aug 21 2006 cthiel@suse.de -- fix requirements of -devel package, to require fuse by version (#200496) -* Tue Aug 08 2006 tiwai@suse.de -- fixed a syntax error in udev rules. -* Mon Jul 03 2006 cthiel@suse.de -- fix build -* Mon May 15 2006 tiwai@suse.de -- updated to version 2.5.3. - * Add missing rwlock initialization - * Fix negative entry handling. - * Fix race between RELEASE and UNLINK, which might leave - .fuse_hidden* files around - * libfuse: fix use-after-free bug in interruptred reply_entry(). -* Fri Feb 03 2006 cthiel@suse.de -- update to version 2.5.2 - * lib: if "fsname=" option was given, pass it to fusermount - * fuse_opt: fix memory leak in handling "--" option - * fuse_opt.h: fix incompatibility with C++ compilers by renaming - 'template' structure member to 'templ' - * fuse.h: fix compatibility bugs. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Sat Jan 14 2006 cthiel@suse.de -- update to version 2.5.0 -* Wed Nov 23 2005 cthiel@suse.de -- update to version 2.4.2 -- changed permission of /usr/bin/fusermount to 4755 -* Fri Oct 28 2005 cthiel@suse.de -- readded -fno-strict-aliasing -* Fri Oct 28 2005 cthiel@suse.de -- update to version 2.4.1 -* Fri Sep 30 2005 tiwai@suse.de -- fixed CFLAGS to pass RPM_OPT_FLAGS. -- added -fno-strict-aliasing. -* Wed Jun 08 2005 tiwai@suse.de -- updated to version 2.3.0. -* Tue Feb 03 2004 adrian@suse.de -- initial package of version 1.1-pre2