rpms/cryptsetup
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Various spec file updates.

Browse Source 
- 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:
Ondrej Kozina 2018-07-17 15:26:16 +02:00
parent 51772706fe
commit 102814679a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cryptsetup.spec
View File

@ -22,13 +22,12 @@ Obsoletes: cryptsetup-python3
Summary: A utility for setting up encrypted disks Summary: A utility for setting up encrypted disks
Name: cryptsetup Name: cryptsetup
Version: 2.0.3 Version: 2.0.3
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: Applications/System Group: Applications/System
URL: https://gitlab.com/cryptsetup/cryptsetup URL: https://gitlab.com/cryptsetup/cryptsetup
BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel BuildRequires: openssl-devel, popt-devel, device-mapper-devel
BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel BuildRequires: libuuid-devel, gcc
BuildRequires: libselinux-devel, gcc
%if %{python2_enable} %if %{python2_enable}
BuildRequires: python2-devel BuildRequires: python2-devel
%endif %endif
@ -51,7 +50,6 @@ disk encryption using dm-crypt kernel module.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libgcrypt-devel > 1.1.42, device-mapper-devel, libuuid-devel
Requires: pkgconfig Requires: pkgconfig
Summary: Headers and libraries for using encrypted file systems Summary: Headers and libraries for using encrypted file systems
Provides: cryptsetup-luks-devel = %{version}-%{release} Provides: cryptsetup-luks-devel = %{version}-%{release}
@ -140,21 +138,15 @@ cp -a . %{py3dir}
%build %build
%if %{python2_enable} || %{python3_enable} %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 %else
%configure --enable-fips --enable-pwquality --enable-libargon2 %configure --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl
%endif %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} make %{?_smp_mflags}
%if %{python3_enable} %if %{python3_enable}
pushd %{py3dir} pushd %{py3dir}
%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 %configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --disable-rpath --with-crypto_backend=openssl
# 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} make %{?_smp_mflags}
popd popd
%endif %endif
@ -235,6 +227,11 @@ popd
%clean %clean
%changelog %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 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild