extract library to subpackage

[packages/cryptsetup.git] / cryptsetup.spec

diff --git a/cryptsetup.spec b/cryptsetup.spec
index 302e8ba4f1ddfbbc90e6f154ed22ce71ca69297b..b6d8a526f5b0a06c55cd7fe98f1c306ca00c2d31 100644 (file)
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -10,18 +10,20 @@
 Summary:       LUKS for dm-crypt implemented in cryptsetup
 Summary(pl.UTF-8):     LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:          cryptsetup
-Version:       2.1.0
+Version:       2.6.1
 Release:       1
 License:       GPL v2
 Group:         Base
-Source0:       https://www.kernel.org/pub/linux/utils/cryptsetup/v2.1/%{name}-%{version}.tar.xz
-# Source0-md5: 41d8b985ef69242852b93e95d53e8e28
+Source0:       https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/%{name}-%{version}.tar.xz
+# Source0-md5: f9451ea928dc600eb34dd9f4d9ca34e5
 Patch0:                diet.patch
+Patch1:                no_pty_tests.patch
+Patch2:                %{name}-sh.patch
 URL:           https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: autoconf >= 2.67
 BuildRequires: automake >= 1:1.12
 BuildRequires: device-mapper-devel >= 1.02.27
-BuildRequires: gettext-tools >= 0.18.3
+BuildRequires: gettext-tools >= 0.21
 BuildRequires: json-c-devel
 BuildRequires: libargon2-devel >= 20171227
 BuildRequires: libblkid-devel
@@ -30,12 +32,14 @@ BuildRequires:      libgpg-error-devel
 %{?with_pwquality:BuildRequires:       libpwquality-devel >= 1.0.0}
 BuildRequires: libselinux-devel
 BuildRequires: libsepol-devel
+BuildRequires: libssh-devel
 BuildRequires: libtool >= 2:2.0
 BuildRequires: libuuid-devel
 %{!?with_gcrypt:BuildRequires: openssl-devel >= 0.9.8}
 %{?with_passwdqc:BuildRequires:        passwdqc-devel}
 BuildRequires: pkgconfig
 BuildRequires: popt-devel >= 1.7
+BuildRequires: ruby-asciidoctor
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 %if %{with initrd}
@@ -56,6 +60,8 @@ 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}
 Requires:      popt >= 1.7
@@ -92,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
@@ -144,6 +164,8 @@ cryptsetup - wersję statycznie zlinkowaną dla initrd.
 %prep
 %setup -q
 %{?with_diet:%patch0 -p1}
+%patch1 -p1
+%patch2 -p1
 
 %{__rm} po/stamp-po
 
@@ -188,7 +210,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
@@ -217,10 +239,12 @@ install -d $RPM_BUILD_ROOT/var/run/cryptsetup
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/cryptsetup/libcryptsetup-*.{la,a}
+
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
 install -p cryptsetup-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/cryptsetup
@@ -231,25 +255,30 @@ 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)
-%doc AUTHORS FAQ README TODO docs/{ChangeLog.old,v*-ReleaseNotes,on-disk-format.pdf}
+%doc AUTHORS FAQ.md README.md docs/{ChangeLog.old,v*-ReleaseNotes,on-disk-format.pdf}
 %attr(755,root,root) %{_sbindir}/cryptsetup
-%attr(755,root,root) %{_sbindir}/cryptsetup-reencrypt
+%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*
-%{_mandir}/man8/cryptsetup-reencrypt.8*
+%{_mandir}/man8/cryptsetup-*.8*
 %{_mandir}/man8/integritysetup.8*
 %{_mandir}/man8/veritysetup.8*
 %{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