From 2377ed648b2107dd350e89d00f0fac7b998f0c13 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@fedoraproject.org>
Date: Jun 19 2009 12:10:44 +0000
Subject: - fixing btrfs-progs so it builds everything again


---

diff --git a/btrfs-progs-build-everything.patch b/btrfs-progs-build-everything.patch
new file mode 100644
index 0000000..522e6c8
--- /dev/null
+++ b/btrfs-progs-build-everything.patch
@@ -0,0 +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
+ 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
+ 
+ # make C=1 to enable sparse
+ ifdef C
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 9297771..7be5232 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,6 +1,6 @@
 Name:           btrfs-progs
 Version:        0.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Userspace programs for btrfs
 
 Group:          System Environment/Base
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
 Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
 Patch0: btrfs-progs-fix-labels.patch
+Patch1: btrfs-progs-build-everything.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  e2fsprogs-devel, zlib-devel, libacl-devel
@@ -21,6 +22,7 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_root_sbindir}/btrfstune
 
 %changelog
+* Fri Jun 19 2009 Josef Bacik <josef@toxicpanda.com> 0.19-2
+- add a patch for the Makefile to make it build everything again
+
 * Fri Jun 19 2009 Josef Bacik <josef@toxicpanda.com> 0.19-1
 - update to v0.19 of btrfs-progs for new format