From 0a6522ee052bcc808a5eee1d8af7f0201cf392bb9616407d75470572589dc6d9 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 24 Sep 2015 05:18:06 +0000
Subject: [PATCH] Accepting request 332815 from filesystems

- update to 4.2.1 (forwarded request 332814 from dsterba)

OBS-URL: https://build.opensuse.org/request/show/332815
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=63
---
 btrfs-progs-v4.2.1.tar.gz    |  3 +++
 btrfs-progs-v4.2.tar.gz      |  3 ---
 btrfsprogs.changes           | 19 +++++++++++++++++++
 btrfsprogs.spec              |  2 +-
 local-version-override.patch |  4 ++--
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 btrfs-progs-v4.2.1.tar.gz
 delete mode 100644 btrfs-progs-v4.2.tar.gz

diff --git a/btrfs-progs-v4.2.1.tar.gz b/btrfs-progs-v4.2.1.tar.gz
new file mode 100644
index 0000000..c075cba
--- /dev/null
+++ b/btrfs-progs-v4.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c89d014c45f0d90da3808c882d97ecdb2e2f1ef1ad7e4b3e9d820620d19b197f
+size 1384768
diff --git a/btrfs-progs-v4.2.tar.gz b/btrfs-progs-v4.2.tar.gz
deleted file mode 100644
index 1adc777..0000000
--- a/btrfs-progs-v4.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa4c00f124d531bf420d3bbb0b0e14f4663322bdaa631558d42f7106cf3ee3a6
-size 1370590
diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index 2d6c53b..c5a38d3 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Sep 22 00:00:00 CEST 2015 - dsterba@suse.cz
+
+- update to 4.2.1
+  - fix an off-by-one error in cross-stripe boundary check
+  - convert: don't write uninitialized data to image
+  - image:  don't loop with option -t0
+  - image: don't create threads if compression is not requested
+- Removed patches:
+  * 0001-btrfs-progs-fix-cross-stripe-boundary-check.patch
+
+-------------------------------------------------------------------
+Thu Sep 17 00:00:00 CEST 2015 - dsterba@suse.cz
+
+- make mkfs work with 64k nodesize again, notably fixes mkfs on ppc64
+  (bsc#945229)
+- Added patch:
+  * 0001-btrfs-progs-fix-cross-stripe-boundary-check.patch
+
 -------------------------------------------------------------------
 Thu Sep  3 00:00:00 CEST 2015 - dsterba@suse.cz
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index 26ff543..17cf9ed 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           btrfsprogs
-Version:        4.2
+Version:        4.2.1
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0
diff --git a/local-version-override.patch b/local-version-override.patch
index 68680bd..0ffe441 100644
--- a/local-version-override.patch
+++ b/local-version-override.patch
@@ -6,8 +6,8 @@ Index: btrfs-progs-v4.1/version.sh
  # Copyright 2008, Oracle
  # Released under the GNU GPLv2
  
--v="v4.2"
-+v="v4.2+20150903"
+-v="v4.2.1"
++v="v4.2+20150922"
  
  opt=$1