From bc99ad990ca9443f26ad13182cbc43f559597df49bcdafe3cb601bf8d7bf4eb0 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sun, 5 Jul 2015 15:58:08 +0000
Subject: [PATCH] Accepting request 313577 from filesystems

1

OBS-URL: https://build.opensuse.org/request/show/313577
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=58
---
 btrfs-progs-v4.0.tar.gz      |  3 --
 btrfs-progs-v4.1.tar.gz      |  3 ++
 btrfsprogs.changes           | 69 ++++++++++++++++++++++++++++++++++++
 btrfsprogs.spec              |  3 +-
 local-version-override.patch | 12 +++----
 5 files changed, 79 insertions(+), 11 deletions(-)
 delete mode 100644 btrfs-progs-v4.0.tar.gz
 create mode 100644 btrfs-progs-v4.1.tar.gz

diff --git a/btrfs-progs-v4.0.tar.gz b/btrfs-progs-v4.0.tar.gz
deleted file mode 100644
index 56648f3..0000000
--- a/btrfs-progs-v4.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:acb4cfa42f9c34dc6c4f701f8c56e57099baa1b44646df1bb5a292d8e571c465
-size 1336434
diff --git a/btrfs-progs-v4.1.tar.gz b/btrfs-progs-v4.1.tar.gz
new file mode 100644
index 0000000..0fa9acd
--- /dev/null
+++ b/btrfs-progs-v4.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aad633d978c21b123bf903be75d9afd3ba6723e1e5ce3169c6394949629d69d2
+size 1356575
diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index 0c40cd6..f173fae 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,72 @@
+-------------------------------------------------------------------
+Wed Jun 24 00:00:00 CEST 2015 - dsterba@suse.cz
+
+- spec: drop libacl dependency
+
+-------------------------------------------------------------------
+Mon Jun 22 00:00:00 CEST 2015 - dsterba@suse.cz
+
+- version 4.1
+  * bugfixes
+    - fsck.btrfs: no bash-isms
+    - bugzilla 97171: invalid memory access (with tests)
+    - receive:
+      - cloning works with --chroot
+      - capabilities not lost
+    - mkfs: do not try to register bare file images
+    - option --help accepted by the standalone utilities
+  * enhancements
+    - corrupt block: ability to remove csums
+    - mkfs:
+      - warn if metadata redundancy is lower than for data
+      - options to make the output quiet (only errors)
+      - mixed case names of raid profiles accepted
+      - rework the output:
+	- more comprehensive, 'key: value' format
+    - subvol:
+      - show:
+	- print received uuid
+	- update the output
+	- new options to specify size units
+      - sync:
+	- grab all deleted ids and print them as they're removed,
+	  previous implementation only checked if there are any
+	  to be deleted - change in command semantics
+    - scrub: print timestamps in days HMS format
+    - receive:
+      - can specify mount point, do not rely on /proc
+      - can work inside subvolumes
+    - send:
+      - new option to send stream without data (NO_FILE_DATA)
+    - convert:
+      - specify incompat features on the new fs
+    - qgroup:
+      - show: distinguish no limits and 0 limit value
+      - limit: ability to clear the limit
+    - help for 'btrfs' is shorter, 1st level command overview
+    - debug tree: print key names according to their C name
+  * new
+    - rescure zero-log
+    - btrfsune:
+      - rewrite uuid on a filesystem image
+      - new option to turn on NO_HOLES incompat feature
+  * deprecated
+    - standalone btrfs-zero-log
+  * other
+    - testing framework updates
+      - uuid rewrite test
+      - btrfstune feature setting test
+      - zero-log tests
+      - more testing image formats
+    - manual page updates
+    - ioctl.h synced with current kernel uapi version
+    - convert: preparatory works for more filesystems (reiserfs pending)
+    - use static buffers for path handling where possible
+    - add new helpers for send uilts that check memory allocations,
+      switch all users, deprecate old helpers
+    - Makefile: fix build dependency generation
+    - map-logical: make it work again
+
 -------------------------------------------------------------------
 Tue Jun  2 07:57:43 UTC 2015 - antoine.belvire@laposte.net
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index a6dd55f..3a99b29 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           btrfsprogs
-Version:        4.0
+Version:        4.1
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0
@@ -40,7 +40,6 @@ Patch1001:      fix-doc-build-on-SLE11SP3.diff
 BuildRequires:  asciidoc
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
 BuildRequires:  libblkid-devel
 BuildRequires:  libext2fs-devel
diff --git a/local-version-override.patch b/local-version-override.patch
index 3e3d6e2..803da43 100644
--- a/local-version-override.patch
+++ b/local-version-override.patch
@@ -1,13 +1,13 @@
-Index: btrfs-progs-v3.19/version.sh
+Index: btrfs-progs-v4.1/version.sh
 ===================================================================
---- btrfs-progs-v3.19.orig/version.sh
-+++ btrfs-progs-v3.19/version.sh
+--- btrfs-progs-v4.1.orig/version.sh
++++ btrfs-progs-v4.1/version.sh
 @@ -6,7 +6,7 @@
  # Copyright 2008, Oracle
  # Released under the GNU GPLv2
-  
--v="v4.0"
-+v="v4.0+20150429"
+ 
+-v="v4.1"
++v="v4.1+20150622"
  
  opt=$1