- updated to 2.9.2

- updated Makefile.am patch
- removed outdated link,clone patches

diff --git a/kernel-misc-fuse-Makefile.am.patch b/kernel-misc-fuse-Makefile.am.patch
index 99a7cfe7a6578a23d0fa791fb7f5b1987d6999b4..d23ac8048cb24906edbd0bff4f52b0f2c63fc0d2 100644 (file)
--- a/kernel-misc-fuse-Makefile.am.patch
+++ b/kernel-misc-fuse-Makefile.am.patch
@@ -1,13 +1,13 @@
---- fuse-2.7.0/util/Makefile.am.orig   2007-04-25 18:06:47.000000000 +0200
-+++ fuse-2.7.0/util/Makefile.am        2007-07-03 19:06:14.006315824 +0200
-@@ -13,14 +13,6 @@
+--- fuse-2.9.2/util/Makefile.am.orig   2012-07-19 14:33:49.000000000 +0200
++++ fuse-2.9.2/util/Makefile.am        2012-10-19 16:23:14.396963408 +0200
+@@ -20,14 +20,6 @@
  ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT 
  ulockmgr_server_LDFLAGS = -pthread
  
 -install-exec-hook:
 -      -chmod u+s $(DESTDIR)$(bindir)/fusermount
 -      @if test ! -e $(DESTDIR)/dev/fuse; then \
--              $(mkdir_p) $(DESTDIR)/dev; \
+-              $(MKDIR_P) $(DESTDIR)/dev; \
 -              echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
 -              mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
 -      fi
@@ -15,9 +15,9 @@
  EXTRA_DIST = udev.rules init_script
  
  MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
-@@ -33,10 +24,6 @@
-       $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
-       $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+@@ -39,10 +31,6 @@
+       $(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+       $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
        $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
 -      @if test -x /usr/sbin/update-rc.d; then \
 -              echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
@@ -25,8 +25,8 @@
 -      fi
  
  install-data-local:
-       $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
-@@ -46,7 +33,3 @@
+       $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_PATH)
+@@ -52,7 +40,3 @@
        rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
        rm -f $(DESTDIR)$(UDEV_RULES_PATH)/99-fuse.rules
        rm -f $(DESTDIR)$(INIT_D_PATH)/fuse

diff --git a/libfuse-clone.patch b/libfuse-clone.patch
deleted file mode 100644 (file)
index a4e39ec..0000000
--- a/libfuse-clone.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- fuse-2.8.6/util/fusermount.c.orig  2011-09-13 09:23:14.000000000 +0200
-+++ fuse-2.8.6/util/fusermount.c       2011-09-17 09:14:59.257527441 +0200
-@@ -7,6 +7,9 @@
- */
- /* This program does the mounting and unmounting of FUSE filesystems */
- 
-+/* for CLONE_NEWNS in sched.h */
-+#define _GNU_SOURCE
-+
- #include <config.h>
- 
- #include "mount_util.h"

diff --git a/libfuse-link.patch b/libfuse-link.patch
deleted file mode 100644 (file)
index ae3d603..0000000
--- a/libfuse-link.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- fuse-2.7.0/util/Makefile.am.orig   2007-07-03 19:07:37.997256742 +0200
-+++ fuse-2.7.0/util/Makefile.am        2007-07-03 19:09:22.729253309 +0200
-@@ -5,7 +5,7 @@
- noinst_PROGRAMS = mount.fuse
- 
- fusermount_SOURCES = fusermount.c
--fusermount_LDADD = ../lib/mount_util.lo
-+fusermount_LDADD = ../lib/mount_util.lo $(LIBSELINUX)
- fusermount_CPPFLAGS = -I../lib
- mount_fuse_SOURCES = mount.fuse.c
- 
---- fuse-2.7.0/configure.in.orig       2007-07-02 13:32:15.000000000 +0200
-+++ fuse-2.7.0/configure.in    2007-07-03 19:10:56.654033356 +0200
-@@ -98,5 +98,9 @@
- AM_CONDITIONAL(LINUX, test "$arch" = linux)
- AM_CONDITIONAL(BSD, test "$arch" = bsd)
- 
-+LIBSELINUX=
-+AC_CHECK_HEADERS(selinux/selinux.h, AC_CHECK_LIB(selinux, getfilecon, [LIBSELINUX=-lselinux]))
-+AC_SUBST(LIBSELINUX)
-+
- AC_CONFIG_FILES([fuse.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile])
- AC_OUTPUT
-
---- fuse-2.6.1/lib/Makefile.am.orig    2006-12-01 12:59:21.000000000 +0100
-+++ fuse-2.6.1/lib/Makefile.am 2006-12-12 21:51:19.302803339 +0100
-@@ -40,5 +40,6 @@
- 
- libulockmgr_la_SOURCES = ulockmgr.c
- libulockmgr_la_LDFLAGS = -pthread -version-number 1:0:1
-+libulockmgr_la_LIBADD = -lpthread
- 
- EXTRA_DIST = fuse_versionscript
-

diff --git a/libfuse.spec b/libfuse.spec
index d1558d13ce7c00ddd721dec8e9fc28f39ed2280e..edaca009d723e66fb25e119196fd7b8baee52b6f 100644 (file)
--- a/libfuse.spec
+++ b/libfuse.spec
@@ -3,34 +3,27 @@
 #   /etc/rc.d/init.d/fuse
 #   /etc/udev/rules.d/99-fuse.rules
 #
-# Condtional build:
-%bcond_without selinux         # build without SELinux support
-#
 Summary:       Filesystem in Userspace
 Summary(pl.UTF-8):     System plików w przestrzeni użytkownika
 Name:          libfuse
-Version:       2.8.6
-Release:       2
+Version:       2.9.2
+Release:       1
 Epoch:         0
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/fuse/fuse-%{version}.tar.gz
-# Source0-md5: eaa32c8cef56a981656a786f258a002a
+# Source0-md5: 7d80d0dc9cc2b9199a0c53787c151205
 Source1:       fuse.conf
 Patch0:                kernel-misc-fuse-Makefile.am.patch
-Patch1:                %{name}-link.patch
-Patch2:                %{name}-clone.patch
 URL:           http://fuse.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.60
 BuildRequires: automake
-BuildRequires: cpp
-BuildRequires: gettext-devel
-%{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: sed >= 4.0
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Provides:      group(fuse)
+Suggests:      mount >= 2.18
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -77,8 +70,6 @@ Statyczna biblioteka libfuse.
 %prep
 %setup -q -n fuse-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 sed -i '/FUSERMOUNT_PROG/s,fusermount,%{_bindir}/fusermount,' lib/mount.c
 
@@ -90,12 +81,12 @@ install -d ld-dir
 PATH=$(pwd)/ld-dir:$PATH
 %{__libtoolize}
 %{__aclocal}
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        INIT_D_PATH=/etc/rc.d/init.d \
-       %{!?with_selinux:ac_cv_header_selinux_selinux_h=no} \
+       --disable-silent-rules \
        --enable-lib \
        --enable-util
 
@@ -136,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost /%{_lib}/libfuse.so.2
 %attr(755,root,root) %{_libdir}/libulockmgr.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libulockmgr.so.1
+%{_mandir}/man1/fusermount.1*
+%{_mandir}/man1/ulockmgr_server.1*
+%{_mandir}/man8/mount.fuse.8*
 
 %files devel
 %defattr(644,root,root,755)