!53 update to 3.7.1
From: @dillon_chen Reviewed-by: @overweight Signed-off-by: @overweight
This commit is contained in:
commit
3e09a03b54
@ -1,42 +0,0 @@
|
|||||||
From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Pentchev <roam@ringlet.net>
|
|
||||||
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
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
libarchive-3.7.1.tar.gz
Normal file
BIN
libarchive-3.7.1.tar.gz
Normal file
Binary file not shown.
@ -1,15 +1,13 @@
|
|||||||
%bcond_without check
|
%bcond_without check
|
||||||
|
|
||||||
Name: libarchive
|
Name: libarchive
|
||||||
Version: 3.6.2
|
Version: 3.7.1
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Multi-format archive and compression library
|
Summary: Multi-format archive and compression library
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://www.libarchive.org/
|
URL: https://www.libarchive.org/
|
||||||
Source0: https://libarchive.org/downloads/%{name}-%{version}.tar.gz
|
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: gcc bison sharutils zlib-devel bzip2-devel xz-devel
|
||||||
BuildRequires: lzo-devel e2fsprogs-devel libacl-devel libattr-devel
|
BuildRequires: lzo-devel e2fsprogs-devel libacl-devel libattr-devel
|
||||||
BuildRequires: openssl-devel libxml2-devel lz4-devel automake libzstd-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
|
The bsdtar package contains standalone bsdtar utility split off regular
|
||||||
libarchive packages.
|
libarchive packages.
|
||||||
|
|
||||||
|
|
||||||
%package -n bsdcpio
|
%package -n bsdcpio
|
||||||
Summary: Copy files to and from archives
|
Summary: Copy files to and from archives
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
@ -49,7 +46,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||||||
The bsdcpio package contains standalone bsdcpio utility split off regular
|
The bsdcpio package contains standalone bsdcpio utility split off regular
|
||||||
libarchive packages.
|
libarchive packages.
|
||||||
|
|
||||||
|
|
||||||
%package -n bsdcat
|
%package -n bsdcat
|
||||||
Summary: Expand files to standard output
|
Summary: Expand files to standard output
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
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
|
input when used in a pipe. In both cases decompressed data it written to
|
||||||
standard output.
|
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
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
|
||||||
@ -186,7 +190,18 @@ run_testsuite
|
|||||||
%doc NEWS README.md
|
%doc NEWS README.md
|
||||||
%{_bindir}/bsdcat
|
%{_bindir}/bsdcat
|
||||||
|
|
||||||
|
%files -n bsdunzip
|
||||||
|
%{!?_licensedir:%global license %%doc}
|
||||||
|
%license COPYING
|
||||||
|
%doc NEWS README.md
|
||||||
|
%{_bindir}/bsdunzip
|
||||||
|
%{_mandir}/*/bsdunzip*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 3 2023 dillon chen<dillon.chen@gmail.com> - 3.7.1-1
|
||||||
|
- Upgrade to 3.7.1
|
||||||
|
- Add new bsdunzip subpackage
|
||||||
|
|
||||||
* Thu Jun 15 2023 renhongxun<renhongxun@h-partners.com> - 3.6.2-2
|
* Thu Jun 15 2023 renhongxun<renhongxun@h-partners.com> - 3.6.2-2
|
||||||
- Only add iconv to the .pc file if needed
|
- Only add iconv to the .pc file if needed
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user