From 0bb5fd89b793d4c0f5ab2137f1ce788fbdd49f4d9c7b123f8fed0e60500367f2 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.com>
Date: Thu, 1 Mar 2012 10:17:34 +0000
Subject: [PATCH] Accepting request 107634 from
 home:rjschwei:branches:filesystems

- really place the binaries in /usr (UsrMerge project)
  The configure and Makefiles do not respect the user settings to
  configure for certain binaries. This lead to circular linkage on package
  build and improper linkage on package install.

OBS-URL: https://build.opensuse.org/request/show/107634
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsdump?expand=0&rev=10
---
 xfsdump.changes |  8 ++++++++
 xfsdump.spec    | 14 +++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/xfsdump.changes b/xfsdump.changes
index 3e3c845..c2a353e 100644
--- a/xfsdump.changes
+++ b/xfsdump.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar  1 00:42:18 UTC 2012 - rschweikert@suse.com
+
+- really place the binaries in /usr (UsrMerge project)
+  The configure and Makefiles do not respect the user settings to
+  configure for certain binaries. This lead to circular linkage on package
+  build and improper linkage on package install.
+
 -------------------------------------------------------------------
 Mon Feb  6 22:27:49 UTC 2012 - rschweikert@suse.com
 
diff --git a/xfsdump.spec b/xfsdump.spec
index 6da4720..cfa98fb 100644
--- a/xfsdump.spec
+++ b/xfsdump.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           xfsdump
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  libattr-devel
@@ -68,9 +69,12 @@ make %{?jobs:-j%jobs}
 %install
 export DIST_ROOT="$RPM_BUILD_ROOT"
 make install
+# Remove the link created by the make file
+rm $RPM_BUILD_ROOT/%{_sbindir}/{xfsdump,xfsrestore}
+mv $RPM_BUILD_ROOT/sbin/{xfsdump,xfsrestore} $RPM_BUILD_ROOT/%{_sbindir}
 #UsrMerge
-ln -sf %_sbindir/xfsdump $RPM_BUILD_ROOT/sbin
-ln -sf %_sbindir/xfsrestore $RPM_BUILD_ROOT/sbin
+ln -s %{_sbindir}/xfsdump $RPM_BUILD_ROOT/sbin
+ln -s %{_sbindir}/xfsrestore $RPM_BUILD_ROOT/sbin
 #EndUsrMerge 
 
 %clean
@@ -78,11 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,755)
- %_sbindir/*
+%{_sbindir}/*
 #UsrMerge
 /sbin/*
 #EndUsrMerge 
-%doc %_defaultdocdir/%name
-/usr/share/man/man8/*
+%doc %{_defaultdocdir}/%name
+%{_mandir}/man8/*
 
 %changelog