packaging: Update to new upstream version

Change-Id: I9061a8eb38967423a32d276b852a66a5d9342ec3

diff --git a/configure.ac b/configure.ac
index 0d2fa63..c5d7c6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -236,7 +236,7 @@ AC_DEFUN([CONFIGURE_GCRYPT], [
 ])
 
 AC_DEFUN([CONFIGURE_OPENSSL], [
-       PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8],,
+       PKG_CHECK_MODULES([OPENSSL], [openssl1.1 >= 0.9.8],,
                AC_MSG_ERROR([You need openssl library.]))
        CRYPTO_CFLAGS=$OPENSSL_CFLAGS
        CRYPTO_LIBS=$OPENSSL_LIBS

diff --git a/packaging/cryptsetup.spec b/packaging/cryptsetup.spec
index c158c2d..e864084 100644 (file)
--- a/packaging/cryptsetup.spec
+++ b/packaging/cryptsetup.spec
@@ -1,6 +1,6 @@
 Name:     cryptsetup
 Summary:  The cryptsetup
-Version:  1.6.7
+Version:  2.3.3
 Release:  1
 License:  GPL-2.0+, LGPL-2.1+
 Group:    Base/Device Management
@@ -17,6 +17,9 @@ BuildRequires: util-linux
 BuildRequires: popt-devel
 BuildRequires: automake
 BuildRequires: gettext
+BuildRequires: pkgconfig(json-c)
+BuildRequires: pkgconfig(libssl1.1)
+BuildRequires: pkgconfig(blkid)
 
 Requires:      libgpg-error
 Requires:      device-mapper
@@ -54,6 +57,7 @@ doc package for cryptsetup
 
 %prep
 %setup -q
+cp %{SOURCE1} ./%{name}.manifest
 
 %build
 cp %{SOURCE1} .
@@ -74,37 +78,48 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%manifest cryptsetup.manifest
-%license COPYING.GPL-2.0+ COPYING.LGPL-2.1+
-%{_libdir}/libcryptsetup.so
-%{_libdir}/libcryptsetup.so.4
-%{_libdir}/libcryptsetup.so.4.7.0
+%manifest %{name}.manifest
+%license COPYING.GPL-2.0+
+%{_libdir}/libcryptsetup.so.*
+%{_prefix}/lib/tmpfiles.d/cryptsetup.conf
 %{_sbindir}/cryptsetup
+%{_sbindir}/cryptsetup-reencrypt
+%{_sbindir}/integritysetup
 %{_sbindir}/veritysetup
 
 %files devel
+%manifest %{name}.manifest
 %license COPYING.GPL-2.0+ COPYING.LGPL-2.1+
 %{_includedir}/libcryptsetup.h
 %{_libdir}/libcryptsetup.so
 %{_libdir}/pkgconfig/libcryptsetup.pc
 
 %files locale
+%manifest %{name}.manifest
 %license COPYING.GPL-2.0+
 %{_datarootdir}/locale/cs/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/da/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/de/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/es/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/fi/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/fr/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/id/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/it/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/ja/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/nl/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/pl/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/pt_BR/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/ru/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/sr/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/sv/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/uk/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/vi/LC_MESSAGES/cryptsetup.mo
-%{_datarootdir}/locale/es/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/zh_CN/LC_MESSAGES/cryptsetup.mo
 
 %files doc
+%manifest %{name}.manifest
 %license COPYING.GPL-2.0+
 %{_mandir}/man8/cryptsetup.8.gz
+%{_mandir}/man8/cryptsetup-reencrypt.8.gz
+%{_mandir}/man8/integritysetup.8.gz
 %{_mandir}/man8/veritysetup.8.gz