rpms/btrfs-progs/devel btrfs-progs-build-everything.patch, NONE, 1.1 btrfs-progs.spec, 1.13, 1.14

[Josef Bacik]

Author: josef

Update of /cvs/pkgs/rpms/btrfs-progs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20913

Modified Files:
	btrfs-progs.spec 
Added Files:
	btrfs-progs-build-everything.patch 
Log Message:
- fixing btrfs-progs so it builds everything again


btrfs-progs-build-everything.patch:

--- NEW FILE btrfs-progs-build-everything.patch ---
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


Index: btrfs-progs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btrfs-progs/devel/btrfs-progs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- btrfs-progs.spec	19 Jun 2009 11:45:22 -0000	1.13
+++ btrfs-progs.spec	19 Jun 2009 12:10:44 -0000	1.14
@@ -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 inconsiste
 %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 at toxicpanda.com> 0.19-2
+- add a patch for the Makefile to make it build everything again
+
 * Fri Jun 19 2009 Josef Bacik <josef at toxicpanda.com> 0.19-1
 - update to v0.19 of btrfs-progs for new format