Don't #include <config.h> in libvolume_key.h

This commit is contained in:
Miloslav Trmač 2015-01-13 23:15:48 +01:00
parent 1ff6710715
commit 6a7979d571
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,25 @@
The library's header file distributed in the devel package cannot include
the config.h file that is only available during build otherwise it's not
possible to use the library outside of the volume_key build process.
Signed-off-by: Vratislav Podzimek <vpodzime@redhat.com>
---
lib/libvolume_key.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/lib/libvolume_key.h b/lib/libvolume_key.h
index 657b626..513f923 100644
--- a/lib/libvolume_key.h
+++ b/lib/libvolume_key.h
@@ -18,8 +18,6 @@ Author: Miloslav Trmač <mitr@redhat.com> */
#ifndef LIBVOLUME_KEY_H__
#define LIBVOLUME_KEY_H__
-#include <config.h>
-
#include <cert.h>
#include <glib.h>
--
2.1.0

View File

@ -3,7 +3,7 @@
Summary: An utility for manipulating storage encryption keys and passphrases
Name: volume_key
Version: 0.3.9
Release: 6%{?dist}
Release: 7%{?dist}
License: GPLv2
Group: Applications/System
URL: https://fedorahosted.org/volume_key/
@ -12,6 +12,8 @@ Requires: volume_key-libs%{?_isa} = %{version}-%{release}
Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.xz
# Upstream commit 04991fe8c4f77c4e5c7874c2db8ca32fb4655f6e
Patch1: volume_key-0.3.9-fips-crash.patch
# Upstream commit 8f8698aba19b501f01285e9eec5c18231fc6bcea
Patch2: volume_key-0.3.9-config.h.patch
BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, /usr/bin/gpg
BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
@ -78,6 +80,7 @@ for other formats is possible, some formats are planned for future releases.
%setup -q
%patch1 -p1 -b .fips-crash
%patch2 -p1 -b .config.h
%build
%configure
@ -118,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitearch}/volume_key.py*
%changelog
* Tue Jan 13 2015 Miloslav Trmač <mitr@redhat.com> - 0.3.9-7
- Don't #include <config.h> in libvolume_key.h
Patch by Vratislav Podzimek <vpodzime@redhat.com>.
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild