Djam/btrfs-progs
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/btrfs-progs.git synced 2025-02-24 02:12:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Place the binaries in /sbin rather than /usr/sbin"

Browse source 
This reverts commit e4faa49641.

Reverting the recent changes until we have time for a proper update.
This commit is contained in:
Eugene Shatokhin 2014-12-25 15:36:36 +03:00
parent 5180ab50ae
commit 402b354665
1 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
btrfs-progs.spec
View file

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