From 402b354665760e3e5edd11a71aea758dcfc48912 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Thu, 25 Dec 2014 15:36:36 +0300
Subject: [PATCH] Revert "Place the binaries in /sbin rather than /usr/sbin"

This reverts commit e4faa49641a70921fb77cbfe73204e54d3edc6a1.

Reverting the recent changes until we have time for a proper update.
---
 btrfs-progs.spec | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 4702e71..865df4a 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,5 +1,3 @@
-%define	_root_sbindir	/sbin
-%define	_root_libdir	/%{_lib}
 %define libname_orig    libbtrfs
 %define major           0
 %define libname         %mklibname btrfs %{major}
@@ -13,8 +11,7 @@ Summary:	Userspace programs for btrfs
 Group:		System/Kernel and hardware
 License:	GPLv2
 URL:		http://btrfs.wiki.kernel.org/
-# Git: git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
-Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs/%{name}-v%{version}.tar.xz
+Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-v%{version}.tar.xz
 # From http://www.spinics.net/lists/linux-btrfs/msg15899.html
 Source1:        btrfs-completion.sh
 # From Fedora
@@ -63,33 +60,25 @@ applications which will use btrfs
 %make CFLAGS="%{optflags}" LDFLAGS="%{ldflags}"
 
 %install
-%makeinstall_std \
-	bindir=%{_root_sbindir} \
-	libdir=%{_root_libdir} \
-	incdir=%{_includedir}/btrfs \
-	mandir=%{_mandir}
-
-rm -f %{buildroot}%{_root_libdir}/*.a
-mkdir -p %{buildroot}%{_libdir}
-mv %{buildroot}%{_root_libdir}/libbtrfs.so %{buildroot}%{_libdir}/
-
+%makeinstall bindir=%{buildroot}%{_sbindir} 
 mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
 cp %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/btrfs
+rm -f %{buildroot}%{_libdir}/*.a
 
 %files
 %doc COPYING INSTALL
-%{_root_sbindir}/btrfs
-%{_root_sbindir}/btrfs-convert
-%{_root_sbindir}/btrfs-debug-tree
-%{_root_sbindir}/btrfs-find-root
-%{_root_sbindir}/btrfs-image
-%{_root_sbindir}/btrfs-map-logical
-%{_root_sbindir}/btrfs-zero-log
-%{_root_sbindir}/btrfsck
-%{_root_sbindir}/btrfstune
-%{_root_sbindir}/btrfs-show-super
-%{_root_sbindir}/fsck.btrfs
-%{_root_sbindir}/mkfs.btrfs
+%{_sbindir}/btrfs
+%{_sbindir}/btrfs-convert
+%{_sbindir}/btrfs-debug-tree
+%{_sbindir}/btrfs-find-root
+%{_sbindir}/btrfs-image
+%{_sbindir}/btrfs-map-logical
+%{_sbindir}/btrfs-zero-log
+%{_sbindir}/btrfsck
+%{_sbindir}/btrfstune
+%{_sbindir}/btrfs-show-super
+%{_sbindir}/fsck.btrfs
+%{_sbindir}/mkfs.btrfs
 %{_mandir}/man5/btrfs.5.*
 %{_mandir}/man8/btrfs.8.*
 %{_mandir}/man8/btrfs-*.8*
@@ -100,7 +89,7 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/btrfs
 %{_datadir}/bash-completion/completions/btrfs
 
 %files -n %{libname}
-%{_root_libdir}/libbtrfs.so.%{major}*
+%{_libdir}/libbtrfs.so.%{major}*
 
 %files -n %{develname}
 %{_includedir}/btrfs/*