From: Stanislaw Wadas <s.wadas@samsung.com>
Date: Thu, 20 Jul 2023 10:03:57 +0000 (+0200)
Subject: packaging: Adjust to new upstream version v2.6.1
X-Git-Tag: accepted/tizen/unified/20230727.173043^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=043cb9d22064ca827c112a6d7e13e8f24064e7fd;hp=420ad62f0bb77970a6ba234bde9e1405f7df7789;p=platform%2Fupstream%2Fcryptsetup.git

packaging: Adjust to new upstream version v2.6.1

 - switch to openssl3 dependency in configure.ac
 - adjust .spec after autogen.sh changes
 - remove man pages due to lack of asciidoctor

Change-Id: I13d73aed86680c4ce2f4c8f02ed44b1794d5b813
Signed-off-by: Stanislaw Wadas <s.wadas@samsung.com>
Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
---

diff --git a/configure.ac b/configure.ac
index d7ba18b..6b1e83c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,7 +310,7 @@ AC_DEFUN([CONFIGURE_GCRYPT], [
 ])
 
 AC_DEFUN([CONFIGURE_OPENSSL], [
-	PKG_CHECK_MODULES([OPENSSL], [openssl1.1 >= 0.9.8],,
+	PKG_CHECK_MODULES([OPENSSL], [openssl3 >= 3.0.9],,
 		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 fe48bce..13881b5 100644
--- a/packaging/cryptsetup.spec
+++ b/packaging/cryptsetup.spec
@@ -1,6 +1,6 @@
 Name:     cryptsetup
 Summary:  The cryptsetup
-Version:  2.3.7
+Version:  2.6.1
 Release:  1
 License:  GPL-2.0+, LGPL-2.1+
 Group:    Base/Device Management
@@ -18,7 +18,7 @@ BuildRequires: popt-devel
 BuildRequires: automake
 BuildRequires: gettext
 BuildRequires: pkgconfig(json-c)
-BuildRequires: pkgconfig(libssl1.1)
+BuildRequires: pkgconfig(openssl3)
 BuildRequires: pkgconfig(blkid)
 
 Requires:      libgpg-error
@@ -63,8 +63,12 @@ cp %{SOURCE1} ./%{name}.manifest
 cp %{SOURCE1} .
 
 chmod +x ./autogen.sh
-./autogen.sh --prefix=%{_prefix} -localedir=%{_datarootdir}/locale -libdir=%{_libdir} \
-             --disable-cryptsetup-reencrypt --disable-integritysetup
+./autogen.sh
+%configure \
+           --disable-cryptsetup-reencrypt \
+           --disable-integritysetup \
+           --disable-asciidoc \
+           --disable-ssh-token
 
 make %{?jobs:-j%jobs}
 
@@ -114,9 +118,9 @@ rm -rf %{buildroot}
 %{_datarootdir}/locale/uk/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/vi/LC_MESSAGES/cryptsetup.mo
 %{_datarootdir}/locale/zh_CN/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/ka/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/ro/LC_MESSAGES/cryptsetup.mo
 
 %files doc
 %manifest %{name}.manifest
 %license COPYING.GPL-2.0+
-%{_mandir}/man8/cryptsetup.8.gz
-%{_mandir}/man8/veritysetup.8.gz