diff --git a/libarchive-c-5.1.tar.gz b/libarchive-c-5.1.tar.gz deleted file mode 100644 index e277f4b..0000000 --- a/libarchive-c-5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bcce24ea6c0fa3bc62468476c6d2f6264156db2f04878a372027c10615a2721 -size 52279 diff --git a/libarchive.patch b/libarchive.patch deleted file mode 100644 index 014f0de..0000000 --- a/libarchive.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a56e9402c76c2fb9631651de7bae07b5fbb0b624 Mon Sep 17 00:00:00 2001 -From: "Charly C." -Date: Sun, 29 Sep 2024 13:43:13 +0200 -Subject: [PATCH] update a test failing with new libarchive versions (#131) - -fixes #130 ---- - tests/test_entry.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/tests/test_entry.py b/tests/test_entry.py -index 419cecb..34543a5 100644 ---- a/tests/test_entry.py -+++ b/tests/test_entry.py -@@ -9,7 +9,7 @@ - - import pytest - --from libarchive import memory_reader, memory_writer -+from libarchive import ArchiveError, memory_reader, memory_writer - from libarchive.entry import ArchiveEntry, ConsumedArchiveEntry, PassedArchiveEntry - - from . import data_dir, get_entries, get_tarinfos -@@ -64,7 +64,13 @@ def test_check_ArchiveEntry_against_TarInfo(): - - - def test_check_archiveentry_using_python_testtar(): -- check_entries(join(data_dir, 'testtar.tar')) -+ # This test behaves differently depending on the libarchive version: -+ # 3.5, 3.6 and presumably all future versions reject the archive as damaged, -+ # whereas older versions accepted it. -+ try: -+ check_entries(join(data_dir, 'testtar.tar')) -+ except ArchiveError as e: -+ assert e.msg == "Damaged tar archive" - - - def test_check_archiveentry_with_unicode_and_binary_entries_tar(): diff --git a/libarchive_c-5.2.tar.gz b/libarchive_c-5.2.tar.gz new file mode 100644 index 0000000..dc35dc3 --- /dev/null +++ b/libarchive_c-5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd44a8e28509af6e78262c98d1a54f306eabd2963dfee57bf298977de5057417 +size 52474 diff --git a/python-libarchive-c.changes b/python-libarchive-c.changes index b54e6a6..dd76a72 100644 --- a/python-libarchive-c.changes +++ b/python-libarchive-c.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Apr 30 06:22:55 UTC 2025 - Dirk Müller + +- update to 5.2: + * Change to the library: fix inoperative `pathname` argument of + `add_files` method (#135), by @nvinson. + * Change to the tests: update a test to handle new libarchive + versions (#131). +- drop libarchive.patch (upstream) + ------------------------------------------------------------------- Tue Nov 12 12:33:08 UTC 2024 - Markéta Machová diff --git a/python-libarchive-c.spec b/python-libarchive-c.spec index 6f624af..58e11eb 100644 --- a/python-libarchive-c.spec +++ b/python-libarchive-c.spec @@ -1,7 +1,7 @@ # # spec file for package python-libarchive-c # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,16 @@ %define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") Name: python-libarchive-c -Version: 5.1 +Version: 5.2 Release: 0 Summary: Python interface to libarchive License: CC0-1.0 Group: Development/Languages/Python URL: https://github.com/Changaco/python-libarchive-c -Source: https://files.pythonhosted.org/packages/source/l/libarchive-c/libarchive-c-%{version}.tar.gz -# PATCH-FIX-UPSTREAM https://github.com/Changaco/python-libarchive-c/pull/131 Handle new libarchive versions -Patch0: libarchive.patch +Source: https://files.pythonhosted.org/packages/source/l/libarchive-c/libarchive_c-%{version}.tar.gz +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros %if %{with libarchive_dynamically} @@ -48,13 +48,13 @@ A Python interface to libarchive. It uses the standard ctypes_ module to dynamically load and access the C library. %prep -%autosetup -p1 -n libarchive-c-%{version} +%autosetup -p1 -n libarchive_c-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -65,6 +65,6 @@ export LANG="en_US.UTF-8" %doc README.rst %license LICENSE.md %{python_sitelib}/libarchive -%{python_sitelib}/libarchive_c-%{version}*info +%{python_sitelib}/libarchive_c-%{version}.dist-info %changelog