Various spec file updates.
- Replace sed script with --disable-rpath configure option. - Switch cryptsetup to openssl crypto backend. - Remove redundant Requires section from devel subpackage. - Drop BuildRequires on libselinux-devel,libsepol-devel and libgpg-error-devel packages.
This commit is contained in:
parent
51772706fe
commit
102814679a
@ -22,13 +22,12 @@ Obsoletes: cryptsetup-python3
|
||||
Summary: A utility for setting up encrypted disks
|
||||
Name: cryptsetup
|
||||
Version: 2.0.3
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: Applications/System
|
||||
URL: https://gitlab.com/cryptsetup/cryptsetup
|
||||
BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
|
||||
BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel
|
||||
BuildRequires: libselinux-devel, gcc
|
||||
BuildRequires: openssl-devel, popt-devel, device-mapper-devel
|
||||
BuildRequires: libuuid-devel, gcc
|
||||
%if %{python2_enable}
|
||||
BuildRequires: python2-devel
|
||||
%endif
|
||||
@ -51,7 +50,6 @@ disk encryption using dm-crypt kernel module.
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, libuuid-devel
|
||||
Requires: pkgconfig
|
||||
Summary: Headers and libraries for using encrypted file systems
|
||||
Provides: cryptsetup-luks-devel = %{version}-%{release}
|
||||
@ -140,21 +138,15 @@ cp -a . %{py3dir}
|
||||
|
||||
%build
|
||||
%if %{python2_enable} || %{python3_enable}
|
||||
%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2
|
||||
%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl
|
||||
%else
|
||||
%configure --enable-fips --enable-pwquality --enable-libargon2
|
||||
%configure --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl
|
||||
%endif
|
||||
# remove rpath
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%if %{python3_enable}
|
||||
pushd %{py3dir}
|
||||
%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2
|
||||
# remove rpath
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
%endif
|
||||
@ -235,6 +227,11 @@ popd
|
||||
%clean
|
||||
|
||||
%changelog
|
||||
* Tue Jul 17 2018 Ondrej Kozina <okozina@redhat.com> - 2.0.3-5
|
||||
- Replace sed script with --disable-rpath configure option.
|
||||
- Switch cryptsetup to openssl crypto backend.
|
||||
- Spec file cleanup.
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user