[fuse/f16] Ver. 2.8.7 for F-15 and F-16
Peter Lemenkov
peter at fedoraproject.org
Thu Apr 19 17:30:25 UTC 2012
commit 27ce32045d4e53cd499a620ac2913a9033e3376a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Apr 19 21:30:10 2012 +0400
Ver. 2.8.7 for F-15 and F-16
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
fuse-0001-Fix-udev-rules-Fedora-specific.patch | 20 ++++++
...heses.patch => fuse-0002-More-parentheses.patch | 12 ++--
fuse.spec | 62 ++++++++++----------
3 files changed, 58 insertions(+), 36 deletions(-)
---
diff --git a/fuse-0001-Fix-udev-rules-Fedora-specific.patch b/fuse-0001-Fix-udev-rules-Fedora-specific.patch
new file mode 100644
index 0000000..d4bb544
--- /dev/null
+++ b/fuse-0001-Fix-udev-rules-Fedora-specific.patch
@@ -0,0 +1,20 @@
+From ba47031f3557b81e732d41593c95e7b984b54b78 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Mon, 9 Aug 2010 12:09:00 +0400
+Subject: [PATCH 1/3] Fix udev rules (Fedora-specific)
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ util/udev.rules | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/util/udev.rules b/util/udev.rules
+index 9585111..bb8033f 100644
+--- a/util/udev.rules
++++ b/util/udev.rules
+@@ -1 +1 @@
+-KERNEL=="fuse", MODE="0666"
++KERNEL=="fuse", MODE="0666",OWNER="root",GROUP="root"
+--
+1.7.3.1
+
diff --git a/fuse-0001-More-parentheses.patch b/fuse-0002-More-parentheses.patch
similarity index 85%
rename from fuse-0001-More-parentheses.patch
rename to fuse-0002-More-parentheses.patch
index 4d34710..bf0eef0 100644
--- a/fuse-0001-More-parentheses.patch
+++ b/fuse-0002-More-parentheses.patch
@@ -1,7 +1,7 @@
-From 22ba14e45e84e0bd12a9ab1c9d0460b9ae27c10c Mon Sep 17 00:00:00 2001
+From 459c84a3e5fda1ef7f7060d44903b31215857e70 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 9 Aug 2010 12:10:40 +0400
-Subject: [PATCH 1/1] More parentheses
+Subject: [PATCH 2/3] More parentheses
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -10,10 +10,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lib/fuse.c b/lib/fuse.c
-index d511964..328ebba 100644
+index 95cf50b..76c2681 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
-@@ -991,17 +991,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path,
+@@ -961,17 +961,15 @@ static int fuse_compat_open(struct fuse_fs *fs, const char *path,
{
int err;
if (!fs->compat || fs->compat >= 25)
@@ -35,7 +35,7 @@ index d511964..328ebba 100644
}
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
-index c86a910..4f19d61 100644
+index c519bfb..d6275b5 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -716,7 +716,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
@@ -48,5 +48,5 @@ index c86a910..4f19d61 100644
fuse_reply_open(req, &fi);
}
--
-1.7.9.3
+1.7.3.1
diff --git a/fuse.spec b/fuse.spec
index 9955c04..704ac1b 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,6 +1,6 @@
Name: fuse
Version: 2.8.7
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: File System in Userspace (FUSE) utilities
Group: System Environment/Base
@@ -9,11 +9,11 @@ URL: http://fuse.sf.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.conf
-Patch1: fuse-0001-More-parentheses.patch
+Patch1: fuse-0001-Fix-udev-rules-Fedora-specific.patch
+Patch2: fuse-0002-More-parentheses.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: kernel >= 2.6.14
Requires: which
-Conflicts: filesystem < 3
BuildRequires: libselinux-devel
Requires(preun): chkconfig
@@ -28,7 +28,6 @@ mount a FUSE filesystem.
Summary: File System in Userspace (FUSE) libraries
Group: System Environment/Libraries
License: LGPLv2+
-Conflicts: filesystem < 3
%description libs
Devel With FUSE it is possible to implement a fully functional filesystem in a
@@ -41,7 +40,6 @@ Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
License: LGPLv2+
-Conflicts: filesystem < 3
%description devel
With FUSE it is possible to implement a fully functional filesystem in a
@@ -53,32 +51,42 @@ pgk-config) to develop FUSE based applications/filesystems.
%setup -q
#disable device creation during build/install
sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
-%patch1 -p1 -b .add_parentheses
+%patch1 -p1 -b .fix_udev_rules
+%patch2 -p1 -b .add_parentheses
%build
# Can't pass --disable-static here, or else the utils don't build
-export MOUNT_FUSE_PATH="%{_sbindir}"
-CFLAGS="%{optflags} -D_GNU_SOURCE" %configure
+CFLAGS="%{optflags} -D_GNU_SOURCE" %configure \
+ --libdir=/%{_lib} \
+ --bindir=/bin \
+ --exec-prefix=/
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
# change from 4755 to 0755 to allow stripping -- fixed later in files
-chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
+chmod 0755 $RPM_BUILD_ROOT/bin/fusermount
+# Put pc file in correct place
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
# Get rid of static libs
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
# No need to create init-script
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/fuse
+# Compatibility symlinks
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s /bin/fusermount fusermount
+ln -s /bin/ulockmgr_server ulockmgr_server
+
# Install config-file
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-# Delete pointless udev rules, which do not belong in /etc (brc#748204)
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/99-fuse.rules
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -97,40 +105,34 @@ fi
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS
-%{_sbindir}/mount.fuse
-%attr(4755,root,root) %{_bindir}/fusermount
+/sbin/mount.fuse
+%attr(4755,root,root) /bin/fusermount
+/bin/ulockmgr_server
+# Compat symlinks
+%{_bindir}/fusermount
%{_bindir}/ulockmgr_server
+%config %{_sysconfdir}/udev/rules.d/99-fuse.rules
%config(noreplace) %{_sysconfdir}/%{name}.conf
%files libs
%defattr(-,root,root,-)
%doc COPYING.LIB
-%{_libdir}/libfuse.so.*
-%{_libdir}/libulockmgr.so.*
+/%{_lib}/libfuse.so.*
+/%{_lib}/libulockmgr.so.*
%files devel
%defattr(-,root,root,-)
-%{_libdir}/libfuse.so
-%{_libdir}/libulockmgr.so
+/%{_lib}/libfuse.so
+/%{_lib}/libulockmgr.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/fuse.h
%{_includedir}/ulockmgr.h
%{_includedir}/fuse
%changelog
-* Mon Apr 16 2012 Peter Lemenkov <lemenkov at gmail.com> - 2.8.7-1
+* Thu Apr 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 2.8.7-1
- Ver. 2.8.7
-* Sun Apr 15 2012 Kay Sievers <kay at redhat.com> - 2.8.6-4
-- remove needless udev rule
-
-* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 2.8.6-3
-- install everything in /usr
- https://fedoraproject.org/wiki/Features/UsrMove
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
* Thu Sep 22 2011 Peter Lemenkov <lemenkov at gmail.com> - 2.8.6-1
- Ver. 2.8.6
- Dropped patch 3 - fixed upstream
More information about the scm-commits
mailing list