- Add patch to remove dependency from libattr-devel package (BZ#1604365)

Signed-off-by: Bruno E. O. Meneguele <bmeneguele@gmail.com>

ima-evm-utils.spec

@@ -1,13 +1,22 @@
 Summary: IMA/EVM support utilities
 Name: ima-evm-utils
 Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Url:  http://linux-ima.sourceforge.net/
 Source: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz
-BuildRequires: autoconf automake libtool m4 asciidoc libxslt
-BuildRequires: openssl-devel libattr-devel keyutils-libs-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: m4
+BuildRequires: asciidoc
+BuildRequires: libxslt
+BuildRequires: openssl-devel
+BuildRequires: keyutils-libs-devel
+# upstream already solved both issues addressed by patch1 and 2, but it's
+# still queued for next release
 Patch1: docbook-xsl-path.patch
+Patch2: remove-libattr-dependency.patch
 
 %description
 The Trusted Computing Group(TCG) run-time Integrity Measurement Architecture
@@ -26,6 +35,7 @@ This package provides the header files for %{name}
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 mkdir -p m4
@@ -52,6 +62,9 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jul 20 2018 Bruno E. O. Meneguele <brdeoliv@redhat.com> - 1.1-4
+- Add patch to remove dependency from libattr-devel package
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

remove-libattr-dependency.patch

@@ -0,0 +1,29 @@
+diff --git a/configure.ac b/configure.ac
+index 0497eb7..a5b4288 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ AC_SUBST(OPENSSL_LIBS)
+ AC_CHECK_HEADER(unistd.h)
+ AC_CHECK_HEADERS(openssl/conf.h)
+ 
+-AC_CHECK_HEADERS(attr/xattr.h, , [AC_MSG_ERROR([attr/xattr.h header not found. You need the libattr development package.])])
++AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])])
+ AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])])
+ 
+ #debug support - yes for a while
+diff --git a/src/evmctl.c b/src/evmctl.c
+index 2ffee78..3fbcd33 100644
+--- a/src/evmctl.c
++++ b/src/evmctl.c
+@@ -49,7 +49,7 @@
+ #include <stdint.h>
+ #include <string.h>
+ #include <dirent.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include <linux/xattr.h>
+ #include <getopt.h>
+ #include <keyutils.h>
+-- 
+2.14.4
+