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 deleted file mode 100644 index 004f3d71962ed16fc32e40702df143711ecac4be..0000000000000000000000000000000000000000 --- a/backport-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch +++ /dev/null @@ -1,42 +0,0 @@ -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-3.6.2.tar.gz b/libarchive-3.7.1.tar.gz similarity index 49% rename from libarchive-3.6.2.tar.gz rename to libarchive-3.7.1.tar.gz index 2dafab016d6338086925fd04dbaa6a18bd24cb31..922b6c729d391c010ffa6228134c164886bac0f1 100644 Binary files a/libarchive-3.6.2.tar.gz and b/libarchive-3.7.1.tar.gz differ diff --git a/libarchive.spec b/libarchive.spec index 461a561c081280dab8213efabd9c11c8076f62ce..9a8c88f6c81611bdfe8e21bbf4814527e800990e 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -1,15 +1,13 @@ %bcond_without check Name: libarchive -Version: 3.6.2 -Release: 2 +Version: 3.7.1 +Release: 1 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 @@ -40,7 +38,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The bsdtar package contains standalone bsdtar utility split off regular libarchive packages. - %package -n bsdcpio Summary: Copy files to and from archives Requires: %{name}%{?_isa} = %{version}-%{release} @@ -49,7 +46,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The bsdcpio package contains standalone bsdcpio utility split off regular libarchive packages. - %package -n bsdcat Summary: Expand files to standard output Requires: %{name}%{?_isa} = %{version}-%{release} @@ -59,6 +55,14 @@ The bsdcat program typically takes a filename as an argument or reads standard input when used in a pipe. In both cases decompressed data it written to standard output. +%package -n bsdunzip +Summary: Extract files from a ZIP archive +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n bsdunzip +The bsdunzip package contains standalone bsdunzip utility split off regular +libarchive packages. It is designed to provide an interface compatible with Info-ZIP's + %prep %autosetup -n %{name}-%{version} -p1 @@ -186,7 +190,18 @@ run_testsuite %doc NEWS README.md %{_bindir}/bsdcat +%files -n bsdunzip +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc NEWS README.md +%{_bindir}/bsdunzip +%{_mandir}/*/bsdunzip* + %changelog +* Thu Aug 3 2023 dillon chen - 3.7.1-1 +- Upgrade to 3.7.1 +- Add new bsdunzip subpackage + * Thu Jun 15 2023 renhongxun - 3.6.2-2 - Only add iconv to the .pc file if needed