[packages/libarchive] - added pc patch (remove iconv from Requires.private); release 2

[qboosh]

commit 45165114dfe4296505e3b4503916fae496559775
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 4 20:50:11 2023 +0100

    - added pc patch (remove iconv from Requires.private); release 2

 libarchive-pc.patch | 12 ++++++++++++
 libarchive.spec     | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/libarchive.spec b/libarchive.spec
index 2ba9d38..e7c9347 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -1,12 +1,12 @@
 #
 # Conditional build:
-%bcond_without	static_libs # don't build static libraries
+%bcond_without	static_libs # static library
 
 Summary:	Multi-format archive and compression library
 Summary(pl.UTF-8):	Biblioteka do archiwizacji i kompresji w wielu formatach
 Name:		libarchive
 Version:	3.6.2
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 # see main page, downloads index may be out of date
@@ -14,13 +14,17 @@ Group:		Libraries
 Source0:	https://www.libarchive.org/downloads/%{name}-%{version}.tar.xz
 # Source0-md5:	72cbb3c085624c825f627bfc8f52ce53
 Patch0:		%{name}-man_progname.patch
+Patch1:		%{name}-pc.patch
 URL:		http://www.libarchive.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	bzip2-devel
 # for <ext2fs/ext2_fs.h>
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	libb2-devel
+BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2
 BuildRequires:	lz4-devel >= r131
 BuildRequires:	lzo-devel >= 2
@@ -128,8 +132,14 @@ bsdtar - implementacja programu tar(1), oparta na libarchive.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I build/autoconf
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 CPPFLAGS="%{rpmcppflags} -I/usr/include/lz4"
 # disable openssl, nettle has all necessary functionality
 %configure \
diff --git a/libarchive-pc.patch b/libarchive-pc.patch
new file mode 100644
index 0000000..fa5f9c6
--- /dev/null
+++ b/libarchive-pc.patch
@@ -0,0 +1,12 @@
+--- libarchive-3.6.2/configure.ac.orig	2022-12-09 14:38:44.000000000 +0100
++++ libarchive-3.6.2/configure.ac	2023-01-04 20:42:49.082195258 +0100
+@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then
+     AC_CHECK_HEADERS([localcharset.h])
+     am_save_LIBS="$LIBS"
+     LIBS="${LIBS} ${LIBICONV}"
++    if test "x${LIBICONV}" != x ; then
+     LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
++    fi
+     AC_CHECK_FUNCS([locale_charset])
+     LIBS="${am_save_LIBS}"
+     if test "x$ac_cv_func_locale_charset" != "xyes"; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libarchive.git/commitdiff/45165114dfe4296505e3b4503916fae496559775