From 26966220f3fcfb7d4c712f3550b52bd642b50ef6 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.com>
Date: Mon, 1 Apr 2019 08:49:22 +0000
Subject: [PATCH] Accepting request 690287 from
 home:jankara:branches:filesystems

- configure-Fix-autoheader-failure.patch: Fix autoheader failure

OBS-URL: https://build.opensuse.org/request/show/690287
OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=106
---
 configure-Fix-autoheader-failure.patch | 37 ++++++++++++++++++++++++++
 e2fsprogs.changes                      |  5 ++++
 e2fsprogs.spec                         |  3 +++
 3 files changed, 45 insertions(+)
 create mode 100644 configure-Fix-autoheader-failure.patch

diff --git a/configure-Fix-autoheader-failure.patch b/configure-Fix-autoheader-failure.patch
new file mode 100644
index 0000000..f9b1a02
--- /dev/null
+++ b/configure-Fix-autoheader-failure.patch
@@ -0,0 +1,37 @@
+From 55c4bbfe8f1e9f2f76811775c77e99bf3dde3534 Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Fri, 29 Mar 2019 17:32:52 +0100
+Subject: [PATCH] configure: Fix autoheader failure
+
+Autoheader reports:
+
+autoheader: warning: missing template: HAVE_BLKID_PROBE_ENABLE_PARTITIONS
+autoheader: Use AC_DEFINE([HAVE_BLKID_PROBE_ENABLE_PARTITIONS], [], [Description])
+autoheader: warning: missing template: HAVE_BLKID_PROBE_GET_TOPOLOGY
+
+so provide appropriate descriptions for the defines.
+
+Signed-off-by: Jan Kara <jack@suse.cz>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 248b291dd0d2..290f93ebdf2f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1119,9 +1119,9 @@ dnl the functions added after migrating that library to util-linux
+ dnl
+ if test -n "$BLKID_CMT"; then
+   AC_CHECK_LIB(blkid, blkid_probe_get_topology,
+-		      AC_DEFINE(HAVE_BLKID_PROBE_GET_TOPOLOGY, 1))
++		      AC_DEFINE(HAVE_BLKID_PROBE_GET_TOPOLOGY, 1, [Define to 1 if blkid library provides blkid_probe_get_topology]))
+   AC_CHECK_LIB(blkid, blkid_probe_enable_partitions,
+-		      AC_DEFINE(HAVE_BLKID_PROBE_ENABLE_PARTITIONS, 1))
++		      AC_DEFINE(HAVE_BLKID_PROBE_ENABLE_PARTITIONS, 1, [Define to 1 if blkid library provides blkid_probe_enable_partitions]))
+ fi
+ dnl
+ if test -n "$DLOPEN_LIB" ; then
+-- 
+2.16.4
+
diff --git a/e2fsprogs.changes b/e2fsprogs.changes
index 16a42f6..0b593b9 100644
--- a/e2fsprogs.changes
+++ b/e2fsprogs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 29 16:56:07 UTC 2019 - Jan Kara <jack@suse.cz>
+
+- configure-Fix-autoheader-failure.patch: Fix autoheader failure
+
 -------------------------------------------------------------------
 Fri Mar 29 15:01:02 UTC 2019 - Jan Kara <jack@suse.cz>
 
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 75802d1..d1353d8 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -81,6 +81,7 @@ Source3:        baselibs.conf
 Patch3:         libcom_err-compile_et_permissions.patch
 Patch4:         e2fsprogs-1.42-implicit_fortify_decl.patch
 Patch5:         e2fsprogs-1.42-ext2fsh_implicit.patch
+Patch6:         configure-Fix-autoheader-failure.patch
 # Do not suppress make commands
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -223,6 +224,7 @@ Development files for the com_err error message display library. Static librarie
 %patch3 -p1
 %patch4
 %patch5
+%patch6 -p1
 cp %{SOURCE2} .
 
 %build
@@ -236,6 +238,7 @@ autoreconf --force --install
   --disable-uuidd \
   --disable-fsck \
   --enable-static \
+  --without-crond-dir \
   CFLAGS="$RPM_OPT_FLAGS"
 %if %{build_mini}
 rm -rf doc