From f53ab4cab970291ee03bf7b47a562d5527f0696b77beeddd098e24ecc6ba2bfb Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <null@suse.de>
Date: Wed, 16 May 2012 19:21:18 +0000
Subject: [PATCH] Accepting request 115749 from
 home:rjschwei:branches:filesystems

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/115749
OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=36
---
 fuse.changes |  5 +++++
 fuse.spec    | 29 +++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/fuse.changes b/fuse.changes
index f56d336..025966a 100644
--- a/fuse.changes
+++ b/fuse.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 26 19:31:47 UTC 2012 - rschweikert@suse.com
+
+- place binaries in /usr tree (UsrMerge project)
+
 -------------------------------------------------------------------
 Sun Apr 22 10:31:21 UTC 2012 - puzel@suse.com
 
diff --git a/fuse.spec b/fuse.spec
index b2f4cc2..c5cabeb 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -272,30 +272,34 @@ Authors:
 %build
 autoreconf -fiv
 export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing"
+export MOUNT_FUSE_PATH=%{_sbindir}
 %configure --with-pic \
     --with-pkgconfigdir=%{_libdir}/pkgconfig \
-	--exec-prefix=/ \
-    --libdir=/%{_lib} \
     --enable-lib \
     --enable-util \
     --enable-example
 %{__make} %{?jobs:-j%jobs}
 
 %install
-make DESTDIR="$RPM_BUILD_ROOT" install
+%make_install
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
 # Needed for OpenSUSE buildservice
 %if %suse_version <= 1020
 install -m644 -D util/udev.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/99-fuse.rules
 %endif
-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
 # not needed for fuse, might reappar in separate package:
 %{__rm} -f %{buildroot}/%{_libdir}/libulockmgr.a
+#UsrMerge
+mkdir $RPM_BUILD_ROOT/sbin
+mkdir $RPM_BUILD_ROOT/%{_lib}
+%{__ln_s} -v %{_sbindir}/mount.fuse $RPM_BUILD_ROOT/sbin
+pushd $RPM_BUILD_ROOT/%{_libdir}
+for libname in $(ls *.so.*);do
+%{__ln_s} -v /%{_libdir}/$libname %{buildroot}/%{_lib}
+done
+popd
+#EndUsrMerge
 
 (cd example && %{__make} clean)
 %{__rm} -rf example/.deps example/Makefile.am example/Makefile.in
@@ -330,7 +334,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/udev/rules.d/99-fuse.rules
 %endif
 %verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount
+#UsrMerge
 /sbin/mount.fuse
+#EndUsrMerge
+%{_sbindir}/mount.fuse
 %{_bindir}/ulockmgr_server
 %{_mandir}/man1/fusermount.1.*
 %{_mandir}/man1/ulockmgr_server.1.*
@@ -338,11 +345,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libfuse2
 %defattr(-,root,root)
+#UsrMerge
 /%{_lib}/libfuse.so.2*
+#EndUsrMerge
+%{_libdir}/libfuse.so.2*
 
 %files -n libulockmgr1
 %defattr(-,root,root)
+#UsrMerge
 /%{_lib}/libulockmgr.so.*
+#EndUsrMerge
+%{_libdir}/libulockmgr.so.*
 
 %files devel
 %defattr(-,root,root)