From d5a333e46ceb6d84456608001d8123cbe07edf09 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <peter@fedoraproject.org>
Date: Nov 11 2006 06:14:37 +0000
Subject: auto-import fuse-2.6.0-1 on branch devel from fuse-2.6.0-1.src.rpm


---

diff --git a/.cvsignore b/.cvsignore
index 639a810..1a86270 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fuse-2.5.3.tar.gz
+fuse-2.6.0.tar.gz
diff --git a/fuse-udev_rules.patch b/fuse-udev_rules.patch
index 8bb1cfa..6ea1408 100644
--- a/fuse-udev_rules.patch
+++ b/fuse-udev_rules.patch
@@ -1,27 +1,5 @@
---- util/Makefile.am	2006-02-02 20:04:53.000000000 +0300
-+++ util/Makefile.am	2006-02-13 14:01:10.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
---- util/Makefile.in	2006-02-13 13:56:18.000000000 +0300
-+++ util/Makefile.in	2006-02-13 14:01:20.000000000 +0300
-@@ -465,7 +465,7 @@
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
--	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/40-fuse.rules
-+	$(INSTALL_DATA) $(srcdir)/udev.rules $(DESTDIR)$(UDEV_RULES_PATH)/60-fuse.rules
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
 --- util/udev.rules	2005-11-03 19:38:05.000000000 +0100
 +++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
 @@ -1 +1 @@
--KERNEL="fuse", NAME="%k", MODE="0666"
+-KERNEL=="fuse", MODE="0666"
 +KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
diff --git a/fuse.spec b/fuse.spec
index b49d9e9..02da73e 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,6 +1,6 @@
 Name:           fuse
-Version:        2.5.3
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -69,7 +69,8 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+# FIXME change from 60 to 99
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
 # change from 4755 to 0755 to allow stripping -- fixed later in files
 chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
@@ -99,24 +100,33 @@ fi
 %files
 %doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
 /sbin/mount.fuse
-%attr(4754,root,fuse) %{_bindir}/fusermount
+%attr(4754,root,fuse) 
+%{_bindir}/fusermount
+%{_bindir}/ulockmgr_server
+%{_sysconfdir}/init.d/fuse
 %{_sysconfdir}/makedev.d/z-fuse
-%{_sysconfdir}/udev/rules.d/60-fuse.rules
-%{_sysconfdir}/udev/makedev.d/60-fuse.nodes
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
+%{_sysconfdir}/udev/makedev.d/99-fuse.nodes
 
 %files libs
 %doc COPYING.LIB
 %{_libdir}/libfuse.so.*
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libfuse.so
+%{_libdir}/libulockmgr.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/fuse.h
+%{_includedir}/ulockmgr.h
 %{_includedir}/fuse
 
 %changelog
 
+* Fri Nov  3 2006 Peter Lemenkov <lemenkov@gmail.com> 2.6.0-1
+- Ver. 2.6.0
+
 * Sun Oct 29 2006 Peter Lemenkov <lemenkov@gmail.com> 2.5.3-5
 - Fixed udev-rule again
 
diff --git a/sources b/sources
index 7612113..d62de00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c7e8b6606b9f158ae20b8521ba2867c  fuse-2.5.3.tar.gz
+fa6c7b07a0be3a3e30d6cf3a6bad5817  fuse-2.6.0.tar.gz