Accepting request 425693 from home:dsterba:branches:filesystems

- removed btrfsprogs-only-install-udev-rules-for-udev-190.patch: fix build

OBS-URL: https://build.opensuse.org/request/show/425693
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=251

btrfsprogs-only-install-udev-rules-for-udev-190.patch

@@ -1,32 +0,0 @@
-From: Jeff Mahoney <jeffm@suse.com>
-Subject: btrfsprogs: only install udev rules for udev >= 190
-Patch-mainline: Submitted, linux-btrfs 30 Aug 2016
-
-Prior to udev v190, there was no btrfs builtin helper.  Installing it on
-systems with an older udev will cause problems.
-
-Signed-off-by: Jeff Mahoney <jeffm@suse.com>
----
-
- configure.ac |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 97e89f2..8fd8f42 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -161,7 +161,13 @@ PKG_STATIC(UUID_LIBS_STATIC, [uuid])
- PKG_CHECK_MODULES(ZLIB, [zlib])
- PKG_STATIC(ZLIB_LIBS_STATIC, [zlib])
- 
--UDEVDIR="$(pkg-config udev --variable=udevdir)"
-+# udev v190 introduced the btrfs builtin and a udev rule to use it.
-+# Our udev rule gives us the friendly dm names but isn't required (or valid)
-+# on earlier releases.
-+UDEVDIR=
-+if pkg-config udev --atleast-version 190; then
-+	UDEVDIR="$(pkg-config udev --variable=udevdir)"
-+fi
- AC_SUBST(UDEVDIR)
- 
- dnl lzo library does not provide pkg-config, let use classic way

btrfsprogs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep  8 00:00:00 CEST 2016 - dsterba@suse.cz
+
+- removed btrfsprogs-only-install-udev-rules-for-udev-190.patch: fix build
+
 -------------------------------------------------------------------
 Tue Sep  6 00:00:00 CEST 2016 - dsterba@suse.cz
 

btrfsprogs.spec

@@ -46,7 +46,6 @@ Patch167:       0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch
 Patch168:       0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch
 
 Patch1000:      local-version-override.patch
-Patch1001:      btrfsprogs-only-install-udev-rules-for-udev-190.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  autoconf
@@ -142,7 +141,6 @@ thing.
 %patch167 -p1
 %patch168 -p1
 %patch1000 -p1
-%patch1001 -p1
 
 %build
 ./autogen.sh