From db2d28e827f8d8bb872ccb5fbb506cee032dbb91 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Thu, 11 Mar 2010 22:06:07 +0000 Subject: [PATCH] - bring btrfs-progs uptodate with upstream. F-12 had this patch, i'm not sure why it didn't get put into F-13. --- btrfs-progs.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/btrfs-progs.spec b/btrfs-progs.spec index 5af6729..85e2cdf 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,6 +1,6 @@ Name: btrfs-progs Version: 0.19 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Userspace programs for btrfs Group: System Environment/Base @@ -12,6 +12,7 @@ Patch1: btrfs-progs-build-everything.patch Patch2: btrfs-progs-valgrind.patch Patch3: btrfs-progs-fix-return-value.patch Patch4: btrfs-progs-build-fixes.patch +Patch5: btrfs-progs-upstream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel @@ -29,6 +30,7 @@ check, modify and correct any inconsistencies in the btrfs filesystem. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/mkfs.btrfs.8.gz %changelog +* Thu Mar 11 2010 Josef Bacik 0.19-10 +- add btrfs-progs-ustream.patch so we are aligned with upstream + * Tue Feb 2 2010 Josef Bacik 0.19-9 - fix btrfsck so it builds on newer glibcs