- build SLE12 versions with quota support again (bsc#1021370)

diff --git a/VERSION b/VERSION
index 267577d47e497a0630bc454b3f74c4fd9a10ced4..2b7c5ae01848a77d95e2792eb83ab605c9aed91a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1
+0.4.2

diff --git a/package/snapper.changes b/package/snapper.changes
index cdfc3c37519f899f1d66237014a48db12c826986..a267afff5e3897e9301374cc38fb184d22bcd06d 100644 (file)
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 02 14:49:59 CET 2017 - aschnell@suse.com
+
+- build SLE12 versions with quota support again (bsc#1021370)
+- versions 0.4.2
+
 -------------------------------------------------------------------
 Wed Dec 21 10:29:57 CET 2016 - aschnell@suse.com
 

diff --git a/snapper.spec.in b/snapper.spec.in
index f6d4ff1f12743558285ce55aca4f9520533da923..8a9f79bbb0ca6175fb507e96459eae92eb2e10ea 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -98,7 +98,7 @@ autoconf
 %if 0%{?suse_version} <= 1310
        --disable-rollback                                                      \
 %endif
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} <= 1310
        --disable-btrfs-quota                                                   \
 %endif
        --disable-silent-rules --disable-ext4

diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc
index b0f7ca660a547651d41a76416692a1f296b1e2c4..c88b556016cef687f647b98d504499a0f7f6d9bb 100644 (file)
--- a/snapper/BtrfsUtils.cc
+++ b/snapper/BtrfsUtils.cc
@@ -77,6 +77,10 @@ struct btrfs_ioctl_vol_args_v2
 #define BTRFS_IOC_SUBVOL_GETFLAGS _IOR(BTRFS_IOCTL_MAGIC, 25, __u64)
 #endif
 
+#ifndef BTRFS_QGROUP_LEVEL_SHIFT
+#define BTRFS_QGROUP_LEVEL_SHIFT 48
+#endif
+
 
 namespace snapper
 {