up to 2.7.0

[packages/cryptsetup.git] / cryptsetup.spec

diff --git a/cryptsetup.spec b/cryptsetup.spec
index b491c8e4b41b1f9b0a47bbe7cf737ed4a27d103e..e9289f2a5ff7e04dd68b2852461d1091c96b44a8 100644 (file)
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -10,12 +10,12 @@
 Summary:       LUKS for dm-crypt implemented in cryptsetup
 Summary(pl.UTF-8):     LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:          cryptsetup
-Version:       2.5.0
+Version:       2.7.0
 Release:       1
 License:       GPL v2
 Group:         Base
-Source0:       https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/%{name}-%{version}.tar.xz
-# Source0-md5: 0813f29b74f137d566aed14d9d18e58e
+Source0:       https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/%{name}-%{version}.tar.xz
+# Source0-md5: 7210d45a19703bca547e8ba190278cb0
 Patch0:                diet.patch
 Patch1:                no_pty_tests.patch
 URL:           https://gitlab.com/cryptsetup/cryptsetup
@@ -34,6 +34,7 @@ BuildRequires:        libsepol-devel
 BuildRequires: libssh-devel
 BuildRequires: libtool >= 2:2.0
 BuildRequires: libuuid-devel
+BuildRequires: linux-libc-headers >= 7:6.4
 %{!?with_gcrypt:BuildRequires: openssl-devel >= 0.9.8}
 %{?with_passwdqc:BuildRequires:        passwdqc-devel}
 BuildRequires: pkgconfig
@@ -59,6 +60,7 @@ BuildRequires:        popt-static
 BuildRequires: udev-static
        %endif
 %endif
+Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:      device-mapper >= 1.02.27
 %{?with_gcrypt:Requires:       libgcrypt >= 1.6.1}
 %{?with_pwquality:Requires:    libpwquality >= 1.0.0}
@@ -96,14 +98,28 @@ użytkownikowi przenosić lub migrować dane w sposób przezroczysty.
 Ten pakiet zawiera implementację LUKS dla dm-crytpa zaimplementowaną w
 cryptsetup.
 
+%package libs
+Summary:       cryptsetup shared library
+Summary(pl.UTF-8):     Biblioteka współdzielona cryptsetup
+Group:         Libraries
+
+%description libs
+cryptsetup shared library.
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona cryptsetup.
+
 %package devel
 Summary:       Header files for cryptsetup library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki cryptsetup
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:      device-mapper-devel >= 1.02.27
+Requires:      json-c-devel
 Requires:      libargon2-devel >= 20171227
+Requires:      libblkid-devel
 %{?with_gcrypt:Requires:       libgcrypt-devel >= 1.6.1}
+Requires:      libuuid-devel
 %{!?with_gcrypt:Requires:      openssl-devel >= 0.9.8}
 Provides:      cryptsetup-luks-devel = %{version}-%{release}
 Obsoletes:     cryptsetup-luks-devel < 1.4.1-2
@@ -193,7 +209,7 @@ diet ${CC#ccache } %{rpmcppflags} %{rpmcflags} %{rpmldflags} -Os -I. -I./lib -st
        -lpopt -lgcrypt -lgpg-error -ldevmapper -luuid -lcompat
 %else
 %{__make} -C src
-mv src/cryptsetup cryptsetup-initrd
+%{__mv} src/cryptsetup cryptsetup-initrd
 %endif
 
 %{__make} clean
@@ -238,8 +254,8 @@ install -p cryptsetup-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/cryptsetup
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -248,8 +264,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/cryptsetup-ssh
 %attr(755,root,root) %{_sbindir}/integritysetup
 %attr(755,root,root) %{_sbindir}/veritysetup
-%attr(755,root,root) /%{_lib}/libcryptsetup.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libcryptsetup.so.12
 %dir %{_libdir}/cryptsetup
 %attr(755,root,root) %{_libdir}/cryptsetup/libcryptsetup-token-ssh.so
 %{_mandir}/man8/cryptsetup.8*
@@ -259,6 +273,11 @@ rm -rf $RPM_BUILD_ROOT
 %{systemdtmpfilesdir}/cryptsetup.conf
 %attr(700,root,root) %dir /var/run/cryptsetup
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libcryptsetup.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libcryptsetup.so.12
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcryptsetup.so