[btrfs-progs/f18] New upstream release

Tue Nov 26 15:32:09 UTC 2013

commit b93957c4d25423f51db82c14bb15ac10679d010f
Author: Eric Sandeen <sandeen at redhat.com>
Date:   Tue Nov 26 07:53:11 2013 -0600

    New upstream release

 .gitignore       |    1 +
 btrfs-progs.spec |  119 ++++++++++++++++++++++++++++++++++++-----------------
 sources          |    2 +-
 3 files changed, 83 insertions(+), 39 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 38ab2b3..670ce31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ repair
 restore
 /btrfs-progs-0.19.20120817git043a639.tar.bz2
 /btrfs-progs-0.20.rc1.20121017git91d9eec.tar.bz2
+/btrfs-progs-v3.12.tar.bz2
diff --git a/btrfs-progs.spec b/btrfs-progs.spec
index 19b3797..5e39f3a 100644
--- a/btrfs-progs.spec
+++ b/btrfs-progs.spec
@@ -1,75 +1,118 @@
-Name:           btrfs-progs
-Version:        0.20.rc1.20121017git91d9eec
-Release:        3%{?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
-Patch0: btrfs-progs-fix-labels.patch
-Patch1: btrfs-progs-valgrind.patch
-Patch2: btrfs-progs-build-fixes.patch
-Patch3: Btrfs-progs-add-btrfs-device-ready-command.patch
-Patch4: Btrfs-progs-detect-if-the-disk-we-are-formatting-is-.patch
-Patch5: btrfs-init-dev-list.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel, libblkid-devel
+Name:		btrfs-progs
+Version:	3.12
+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}-v%{version}.tar.bz2
+
+# 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
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	e2fsprogs-devel, libuuid-devel, zlib-devel
+BuildRequires:	libacl-devel, libblkid-devel, lzo-devel
 
 %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
-%patch0 -p1
+%setup -q -n %{name}-v%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+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}/mkfs.btrfs
 %{_sbindir}/btrfs-debug-tree
 %{_sbindir}/btrfs-image
-%{_sbindir}/btrfs-show
-%{_sbindir}/btrfs-vol
 %{_sbindir}/btrfs-convert
 %{_sbindir}/btrfstune
 %{_sbindir}/btrfs
 %{_sbindir}/btrfs-map-logical
 %{_sbindir}/btrfs-zero-log
-%{_sbindir}/btrfs-restore
 %{_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}/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
-* Wed May  1 2013 Eric Sandeen <sandeen at redhat.com> 0.20.rc1.20121017git91d9eec-3
-- bump revision to rebuild gc'd build & push
+* Mon Nov 25 2013 Eric Sandeen <sandeen at redhat.com> 3.12-1
+- It's a new upstream release!
+
+* Thu Nov 14 2013 Eric Sandeen <sandeen at redhat.com> 0.20.rc1.20131114git9f0c53f-1
+- New upstream snapshot
+
+* Tue Sep 17 2013 Eric Sandeen <sandeen at 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 at 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 at 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 at redhat.com> 0.20.rc1.20130501git7854c8b-2
+- Fix subpackage brokenness
+
+* Wed May 01 2013 Eric Sandeen <sandeen at redhat.com> 0.20.rc1.20130501git7854c8b-1
+- New upstream snapshot
+- btrfs-progs-devel subpackage
+
+* Fri Mar 08 2013 Eric Sandeen <sandeen at redhat.com> 0.20.rc1.20130308git704a08c-1
+- New upstream snapshot
+- btrfs-restore is now a command in the btrfs utility
+
+* Wed Feb 13 2013 Richard W.M. Jones <rjones at redhat.com> 0.20.rc1.20121017git91d9eec-3
+- Include upstream patch to clear caches as a partial fix for RHBZ#863978.
 
 * Thu Nov  1 2012 Josef Bacik <josef at toxicpanda.com> 0.20.rc1.20121017git91d9eec-2
 - fix a bug when mkfs'ing a file (rhbz# 871778)
@@ -172,7 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jan 10 2009 Marek Mahut <mmahut at fedoraproject.org> 0.16-1
 - Upstream release 0.16
 
-* Mon Jun 25 2008 Josef Bacik <josef at toxicpanda.com> 0.15-4
+* Wed Jun 25 2008 Josef Bacik <josef at toxicpanda.com> 0.15-4
 -use fedoras normal CFLAGS
 
 * Mon Jun 23 2008 Josef Bacik <josef at toxicpanda.com> 0.15-3
diff --git a/sources b/sources
index 6c3dfd9..57a32f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b44804be936858099ed1fc5b9c247c6e  btrfs-progs-0.20.rc1.20121017git91d9eec.tar.bz2
+8d0b74f7b9ec90dcdc247d53dc8221c4  btrfs-progs-v3.12.tar.bz2
