drop legacy library

This commit is contained in:
Ondrej Kozina 2017-11-09 12:28:51 +01:00
parent 245fb0ba8b
commit 0e8cd2ac4f
3 changed files with 4 additions and 14 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
/cryptsetup-2.0.0-rc1.tar.xz
/cryptsetup-1.7.5.tar.xz

View File

@ -3,7 +3,7 @@
Summary: A utility for setting up encrypted disks
Name: cryptsetup
Version: 2.0.0
Release: 0.3%{?dist}
Release: 0.4%{?dist}
License: GPLv2+ and LGPLv2+
Group: Applications/System
URL: https://gitlab.com/cryptsetup/cryptsetup
@ -18,7 +18,6 @@ Requires: libpwquality >= 1.2.0
%global upstream_version %{version}-rc1
Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz
Source1: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz
%description
The cryptsetup package contains a utility for setting up
@ -107,16 +106,9 @@ chmod -x misc/dracut_90reencrypt/*
# copy the whole directory for the python3 build
cp -a . %{py3dir}
%setup -T -a 1 -D -n cryptsetup-%{upstream_version}
%build
%configure --enable-python --enable-fips --enable-pwquality %{?configure_pbkdf2}
pushd cryptsetup-1.7.5
%configure --enable-python --enable-fips --enable-pwquality --enable-cryptsetup-reencrypt %{?configure_pbkdf2}
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}
popd
# 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
@ -128,9 +120,6 @@ make %{?_smp_mflags}
popd
%install
pushd cryptsetup-1.7.5
make install DESTDIR=%{buildroot}
popd
make install DESTDIR=%{buildroot}
rm -rf %{buildroot}/%{_libdir}/*.la
@ -199,6 +188,9 @@ popd
%clean
%changelog
* Thu Nov 09 2017 Ondrej Kozina <okozina@redhat.com> - 2.0.0-0.4
- Drop the legacy library.
* Wed Nov 08 2017 Ondrej Kozina <okozina@redhat.com> - 2.0.0-0.3
- Temporary build providing legacy library.

View File

@ -1,2 +1 @@
SHA512 (cryptsetup-2.0.0-rc1.tar.xz) = 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427
SHA512 (cryptsetup-1.7.5.tar.xz) = d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439