From 6ad0ff7ce975f9ecf1d6e1c5a6f507f7822f381583b9fd7d0146923af455a596 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Wed, 27 Aug 2014 15:28:32 +0000
Subject: [PATCH] Accepting request 246660 from
 home:dsterba:branches:filesystems

- add api versioning and package version.h (now 0.1.1)
- Added patches:
  * library-version-defines.patch

OBS-URL: https://build.opensuse.org/request/show/246660
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=168
---
 btrfsprogs.changes            |  7 +++
 btrfsprogs.spec               |  2 +
 library-version-defines.patch | 90 +++++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 library-version-defines.patch

diff --git a/btrfsprogs.changes b/btrfsprogs.changes
index 28e8f66..373263f 100644
--- a/btrfsprogs.changes
+++ b/btrfsprogs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 27 17:23:48 CEST 2014 - dsterba@suse.cz
+
+- add api versioning and package version.h (now 0.1.1)
+- Added patches:
+  * library-version-defines.patch
+
 -------------------------------------------------------------------
 Tue Aug 26 20:13:21 CEST 2014 - dsterba@suse.cz
 
diff --git a/btrfsprogs.spec b/btrfsprogs.spec
index 5e1daa3..dd7bb8a 100644
--- a/btrfsprogs.spec
+++ b/btrfsprogs.spec
@@ -63,6 +63,7 @@ Patch169:       0169-btrfs-progs-Check-metadata-mirrors-in-find-root.patch
 Patch171:       0171-btrfs-progs-make-free-space-checker-work-on-non-4k-s.patch
 
 Patch1000:      local-version-override.patch
+Patch1001:      library-version-defines.patch
 BuildRequires:  asciidoc
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
@@ -130,6 +131,7 @@ build applications to interface with btrfs.
 %patch169 -p1
 %patch171 -p1
 %patch1000 -p1
+%patch1001 -p1
 
 %build
 make %{?_smp_mflags} CFLAGS="%{optflags}" all btrfs-convert \
diff --git a/library-version-defines.patch b/library-version-defines.patch
new file mode 100644
index 0000000..b892158
--- /dev/null
+++ b/library-version-defines.patch
@@ -0,0 +1,90 @@
+From f412157fd429eab3d309602de214639a8c8c584e Mon Sep 17 00:00:00 2001
+From: Arvin Schnell <aschnell@suse.de>
+Date: Mon, 3 Jun 2013 14:31:41 +0200
+Subject: [PATCH] btrfs-progs: library version defines
+
+commit 46de1a6ec3dbb0db203baa6c46cb64ba9b000ea2 changed the
+parameters of btrfs_read_and_process_send_stream().  This breaks
+snapper compilation. We can include version defines usable for the C
+preprocessor.
+
+Version 0.1.0: API up to and including 46de1a6ec3dbb0db2 (3.14.x)
+
+Version 0.1.1: 909131939f750faffb9fab (changed in 3.16)
+
+Signed-off-by: Arvin Schnell <aschnell@suse.de>
+Signed-off-by: David Sterba <dsterba@suse.cz>
+---
+ Makefile      |  2 +-
+ send-stream.h |  5 +++++
+ version.sh    | 17 ++++++++++++++++-
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e721e99c8319..73ef386896bf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,7 @@ libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \
+ 		   uuid-tree.o utils-lib.o
+ libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \
+ 	       crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \
+-	       extent_io.h ioctl.h ctree.h btrfsck.h
++	       extent_io.h ioctl.h ctree.h btrfsck.h version.h
+ TESTS = fsck-tests.sh convert-tests.sh
+ 
+ INSTALL = install
+diff --git a/send-stream.h b/send-stream.h
+index 293bf6af3659..bedff4d0422c 100644
+--- a/send-stream.h
++++ b/send-stream.h
+@@ -18,6 +18,11 @@
+ #ifndef SEND_STREAM_H_
+ #define SEND_STREAM_H_
+ 
++/*
++ * NOTE: this file is public API, any incompatible change has to update
++ * library version
++ */
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff --git a/version.sh b/version.sh
+index 90000019fe1d..2e4a8d9e1303 100644
+--- a/version.sh
++++ b/version.sh
+@@ -8,6 +8,10 @@
+  
+ v="v3.16"
+ 
++lib_major=0
++lib_minor=1
++lib_patchlevel=1
++
+ which git &> /dev/null
+ if [ $? == 0 -a -d .git ]; then
+     if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+@@ -24,8 +28,19 @@ if [ $? == 0 -a -d .git ]; then
+     fi
+ fi
+ 
+-echo "#ifndef __BUILD_VERSION" > .build-version.h
++echo "/* NOTE: this file is autogenerated by version.sh, do not edit */" > .build-version.h
++echo "#ifndef __BUILD_VERSION" >> .build-version.h
++echo >> .build-version.h
+ echo "#define __BUILD_VERSION" >> .build-version.h
++echo >> .build-version.h
++echo "#define BTRFS_LIB_MAJOR $lib_major" >> .build-version.h
++echo "#define BTRFS_LIB_MINOR $lib_minor" >> .build-version.h
++echo "#define BTRFS_LIB_PATCHLEVEL $lib_patchlevel" >> .build-version.h
++echo >> .build-version.h
++echo "#define BTRFS_LIB_VERSION ( BTRFS_LIB_MAJOR * 10000 + \\" >> .build-version.h
++echo "                            BTRFS_LIB_MINOR * 100 + \\" >> .build-version.h
++echo "                            BTRFS_LIB_PATCHLEVEL )" >> .build-version.h
++echo >> .build-version.h
+ echo "#define BTRFS_BUILD_VERSION \"Btrfs $v\"" >> .build-version.h
+ echo "#endif" >> .build-version.h
+ 
+-- 
+1.9.0
+