- bring btrfs-progs uptodate with upstream, add btrfs command and other

features.
This commit is contained in:
Josef Bacik 2010-03-24 19:33:27 +00:00
parent 8a3df8a660
commit 0b8f9cff00
3 changed files with 3008 additions and 16 deletions

View File

@ -1,12 +1,12 @@
diff -up btrfs-progs-0.19/Makefile.orig btrfs-progs-0.19/Makefile
--- btrfs-progs-0.19/Makefile.orig 2009-06-19 08:05:49.151573429 -0400
+++ btrfs-progs-0.19/Makefile 2009-06-19 08:08:35.192509803 -0400
@@ -16,7 +16,7 @@ prefix ?= /usr/local
bindir = $(prefix)/bin
--- btrfs-progs-0.19/Makefile.orig 2010-03-24 14:45:18.001490900 -0400
+++ btrfs-progs-0.19/Makefile 2010-03-24 14:45:35.745491310 -0400
@@ -17,8 +17,7 @@
LIBS=-luuid
-progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck
+progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck btrfs-image btrfstune
progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
- btrfs \
- btrfs-map-logical
+ btrfs btrfs-map-logical btrfstune btrfs-image
# make C=1 to enable sparse
ifdef C

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
Name: btrfs-progs
Version: 0.19
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Userspace programs for btrfs
Group: System Environment/Base
@ -26,11 +26,11 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch1 -p1
%build
make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@ -55,13 +55,20 @@ rm -rf $RPM_BUILD_ROOT
%{_root_sbindir}/btrfs-vol
%{_root_sbindir}/btrfs-convert
%{_root_sbindir}/btrfstune
%{_root_sbindir}/btrfs
%{_root_sbindir}/btrfs-map-logical
%{_mandir}/man8/btrfs-image.8.gz
%{_mandir}/man8/btrfs-show.8.gz
%{_mandir}/man8/btrfsck.8.gz
%{_mandir}/man8/btrfsctl.8.gz
%{_mandir}/man8/mkfs.btrfs.8.gz
%{_mandir}/man8/btrfs.8.gz
%changelog
* Wed Mar 24 2010 Josef Bacik <josef@toxicpanda.com> 0.19-11
- bring btrfs-progs uptodate with upstream, add btrfs command and other
features.
* Thu Mar 11 2010 Josef Bacik <josef@toxicpanda.com> 0.19-10
- fix dso linking issue and bring btrfs-progs uptodate with upstream