From 622d67b66b02728627f31719cdb0f216717e4ae2 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Nov 14 2013 18:20:30 +0000
Subject: New upstream snapshot, in prep for new point release


---

diff --git a/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch b/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
deleted file mode 100644
index 75d8310..0000000
--- a/0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From df1f875e27730fe2b10812b585f3e6bbc5502d8f Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sun, 12 May 2013 16:27:12 +0100
-Subject: [PATCH] libbtrfs: Set SONAME to "libbtrfs.so.0" (instead of
- "libbtrfs.so").
-
-Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-
-
-diff --git a/Makefile b/Makefile
-index da7438e..0446836 100644
---- a/Makefile
-+++ b/Makefile
-@@ -100,7 +100,7 @@ version.h:
- $(libs_shared): $(libbtrfs_objects) $(lib_links) send.h
- 	@echo "    [LD]     $@"
- 	$(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(LDFLAGS) $(lib_LIBS) \
--		-shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
-+		-shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
- 
- $(libs_static): $(libbtrfs_objects)
- 	@echo "    [AR]     $@"
-
-
diff --git a/btrfs-progs-Makefile.patch b/btrfs-progs-Makefile.patch
deleted file mode 100644
index c80ebaa..0000000
--- a/btrfs-progs-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: btrfs-progs-0.20.rc1.20130501git7854c8b/Makefile
-===================================================================
---- btrfs-progs-0.20.rc1.20130501git7854c8b.orig/Makefile
-+++ btrfs-progs-0.20.rc1.20130501git7854c8b/Makefile
-@@ -222,6 +222,8 @@ clean :
- install: $(libs) $(progs) install-man
- 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
- 	$(INSTALL) $(progs) $(DESTDIR)$(bindir)
-+	# make btrfsck a link again under $(DESTDIR)
-+	$(LN) -f $(DESTDIR)$(bindir)/btrfs $(DESTDIR)$(bindir)/btrfsck
- 	$(INSTALL) -m755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL) $(libs) $(DESTDIR)$(libdir)
- 	cp -a $(lib_links) $(DESTDIR)$(libdir)
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 5210350..b83e4b4 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,5 +1,5 @@
 Name:		btrfs-progs
-Version:	0.20.rc1.20130917git194aa4a
+Version:	0.20.rc1.20131114git9f0c53f
 Release:	1%{?dist}
 Summary:	Userspace programs for btrfs
 
@@ -12,11 +12,6 @@ Source0:	%{name}-%{version}.tar.bz2
 # Still must reverse-engineer fixes in there and get upstream
 Patch0:		btrfs-progs-valgrind.patch
 Patch1:		btrfs-init-dev-list.patch
-Patch2:		btrfs-progs-Makefile.patch
-
-# Patch accepted upstream 2013-05-13:
-# http://permalink.gmane.org/gmane.comp.file-systems.btrfs/25681
-Patch3:         0001-libbtrfs-Set-SONAME-to-libbtrfs.so.0-instead-of-libb.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,8 +39,6 @@ btrfs filesystem-specific programs.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?_smp_mflags}
@@ -78,12 +71,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/btrfsck.8.gz
 %{_mandir}/man8/mkfs.btrfs.8.gz
 %{_mandir}/man8/btrfs.8.gz
+%{_mandir}/man8/btrfs-convert.8.gz
+%{_mandir}/man8/btrfs-debug-tree.8.gz
+%{_mandir}/man8/btrfs-find-root.8.gz
+%{_mandir}/man8/btrfs-map-logical.8.gz
+%{_mandir}/man8/btrfs-show-super.8.gz
+%{_mandir}/man8/btrfs-zero-log.8.gz
+%{_mandir}/man8/btrfstune.8.gz
 
 %files devel
 %{_includedir}/*
 %{_libdir}/libbtrfs.so
 
 %changelog
+* Thu Nov 14 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20131114git9f0c53f-1
+- New upstream snapshot
+
 * Tue Sep 17 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130917git194aa4a-1
 - New upstream snapshot
 - Deprecated btrfsctl, btrfs-show, and btrfs-vol; still available in btrfs cmd
diff --git a/sources b/sources
index 891cb81..c6aff45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79b621a10c7fb99a2aadadc26106a3bc  btrfs-progs-0.20.rc1.20130917git194aa4a.tar.bz2
+f73a093e36c580dd767e7cf5223f400f  btrfs-progs-0.20.rc1.20131114git9f0c53f.tar.bz2