diff --git a/backport-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch b/backport-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch new file mode 100644 index 0000000..004f3d7 --- /dev/null +++ b/backport-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch @@ -0,0 +1,42 @@ +From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001 +From: Peter Pentchev +Date: Thu, 29 Dec 2022 00:04:40 +0200 +Subject: [PATCH] Only add "iconv" to the .pc file if needed (#1825) + +Hi, + +Thanks for writing and maintaining libarchive! + +What do you think about this trivial change that does not add "iconv" to +the pkg-config file's list of required packages unless it is actually +needed? On at least Debian GNU/Linux systems, the iconv(3) function is +part of the system C library and there is no Debian package that +installs an iconv.pc file, so I had to make this change to the Debian +package of libarchive. + +Thanks again, and keep up the great work! + +G'luck, +Peter +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d..e2715cfd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" ++ if test -n "$LIBICONV"; 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 +-- +2.33.0 + diff --git a/libarchive.spec b/libarchive.spec index 9ec5ab6..461a561 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -2,12 +2,14 @@ Name: libarchive Version: 3.6.2 -Release: 1 +Release: 2 Summary: Multi-format archive and compression library License: BSD URL: https://www.libarchive.org/ Source0: https://libarchive.org/downloads/%{name}-%{version}.tar.gz +Patch6000: backport-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch + BuildRequires: gcc bison sharutils zlib-devel bzip2-devel xz-devel BuildRequires: lzo-devel e2fsprogs-devel libacl-devel libattr-devel BuildRequires: openssl-devel libxml2-devel lz4-devel automake libzstd-devel @@ -185,6 +187,9 @@ run_testsuite %{_bindir}/bsdcat %changelog +* Thu Jun 15 2023 renhongxun - 3.6.2-2 +- Only add iconv to the .pc file if needed + * Wed Jun 7 2023 dillon chen - 3.6.2-1 - Upgrade to 3.6.2