New upstream release v3.16

.gitignore

@@ -14,3 +14,7 @@ mkfs.btrfs
 repair
 restore
 /btrfs-progs-*.tar.bz2
+/btrfs-progs-v3.14.tar.xz
+/btrfs-progs-v3.14.1.tar.xz
+/btrfs-progs-v3.14.2.tar.xz
+/btrfs-progs-v3.16.tar.xz

btrfs-init-dev-list.patch

@@ -2,15 +2,6 @@ diff --git a/utils.c b/utils.c
 index a5ffb62..f6686c6 100644
 --- a/utils.c
 +++ b/utils.c
-@@ -476,7 +476,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
- 	u64 num_devs;
- 	int ret;
- 
--	device = kmalloc(sizeof(*device), GFP_NOFS);
-+	device = kzalloc(sizeof(*device), GFP_NOFS);
- 	if (!device)
- 		return -ENOMEM;
- 	buf = kmalloc(sectorsize, GFP_NOFS);
 @@ -502,6 +502,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
  	device->bytes_used = 0;
  	device->total_ios = 0;

btrfs-progs.spec

@@ -1,30 +1,44 @@
-Name:           btrfs-progs
-Version:        0.20.rc1.20130308git704a08c
-Release:        1%{?dist}
-Summary:        Userspace programs for btrfs
+Name:		btrfs-progs
+Version:	3.16
+Release:	1%{?dist}
+Summary:	Userspace programs for btrfs
 
-Group:          System Environment/Base
-License:        GPLv2
-URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
-Source0:	%{name}-%{version}.tar.bz2
+Group:		System Environment/Base
+License:	GPLv2
+URL:		http://btrfs.wiki.kernel.org/index.php/Main_Page
+Source0:	https://www.kernel.org/pub/linux/kernel/people/mason/%{name}/%{name}-v%{version}.tar.xz
 
 # Valgrind patch no longer applied, but kept for posterity
 # Still must reverse-engineer fixes in there and get upstream
-Patch0: btrfs-progs-valgrind.patch
-Patch1: btrfs-init-dev-list.patch
+Patch0:		btrfs-progs-valgrind.patch
+Patch1:		btrfs-init-dev-list.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel, libblkid-devel
+BuildRequires:	e2fsprogs-devel, libuuid-devel, zlib-devel
+BuildRequires:	libacl-devel, libblkid-devel, lzo-devel
+BuildRequires:	asciidoc, xmlto
 
 %define _root_sbindir /sbin
 
 %description
-The btrfs-progs package provides all the userpsace programs needed to create,
+The btrfs-progs package provides all the userspace programs needed to create,
 check, modify and correct any inconsistencies in the btrfs filesystem.
 
+%package devel
+Summary:	btrfs filesystem-specific libraries and headers
+Group:		Development/Libraries
+Requires:	btrfs-progs = %{version}-%{release}
+
+%description devel
+btrfs-progs-devel contains the libraries and header files needed to
+develop btrfs filesystem-specific programs.
+
+You should install btrfs-progs-devel if you want to develop
+btrfs filesystem-specific programs.
+
 %prep
-%setup -q
+%setup -q -n %{name}-v%{version}
 %patch1 -p1
 
 %build
@@ -32,21 +46,22 @@ make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make mandir=%{_mandir} bindir=%{_sbindir} install DESTDIR=$RPM_BUILD_ROOT
+make mandir=%{_mandir} bindir=%{_sbindir} libdir=%{_libdir} incdir=%{_includedir}/btrfs install DESTDIR=$RPM_BUILD_ROOT
+# Nuke the static lib
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING INSTALL
-%{_sbindir}/btrfsctl
+%doc COPYING
+%{_libdir}/libbtrfs.so.0*
 %{_sbindir}/btrfsck
+%{_sbindir}/fsck.btrfs
 %{_sbindir}/mkfs.btrfs
 %{_sbindir}/btrfs-debug-tree
 %{_sbindir}/btrfs-image
-%{_sbindir}/btrfs-show
-%{_sbindir}/btrfs-vol
 %{_sbindir}/btrfs-convert
 %{_sbindir}/btrfstune
 %{_sbindir}/btrfs
@@ -54,14 +69,52 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/btrfs-zero-log
 %{_sbindir}/btrfs-find-root
 %{_sbindir}/btrfs-show-super
-%{_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
+%{_mandir}/man5/*.gz
+%{_mandir}/man8/*.gz
+
+%files devel
+%{_includedir}/*
+%{_libdir}/libbtrfs.so
 
 %changelog
+* Wed Aug 27 2014 Eric Sandeen <sandeen@redhat.com> 3.16-1
+- New upstream release
+
+* Fri May 30 2014 Eric Sandeen <sandeen@redhat.com> 3.14.2-1
+- New upstream release
+
+* Mon Apr 22 2014 Eric Sandeen <sandeen@redhat.com> 3.14.1-1
+- New upstream release
+
+* Wed Apr 16 2014 Eric Sandeen <sandeen@redhat.com> 3.14-1
+- New upstream release
+
+* Mon Jan 20 2014 Eric Sandeen <sandeen@redhat.com> 3.12-2
+- Add proper Source0 URL, switch to .xz
+
+* Mon Nov 25 2013 Eric Sandeen <sandeen@redhat.com> 3.12-1
+- It's a new upstream release!
+
+* 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
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20.rc1.20130501git7854c8b-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon May 13 2013 Richard W.M. Jones <rjones@redhat.com> 0.20.rc1.20130501git7854c8b-3
+- Add accepted upstream patch to fix SONAME libbtrfs.so -> libbtrfs.so.0
+
+* Thu May 02 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130501git7854c8b-2
+- Fix subpackage brokenness
+
+* Wed May 01 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130501git7854c8b-1
+- New upstream snapshot
+- btrfs-progs-devel subpackage
+
 * Fri Mar 08 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130308git704a08c-1
 - New upstream snapshot
 - btrfs-restore is now a command in the btrfs utility

sources

@@ -1 +1 @@
-be14c7227165ad1134355503a85fcfa8  btrfs-progs-0.20.rc1.20130308git704a08c.tar.bz2
+26035e2ff30513dfeeb2538cacf954b2  btrfs-progs-v3.16.tar.xz