diff --git a/spec-cleaner-1.2.2+5.obscpio b/spec-cleaner-1.2.2+5.obscpio deleted file mode 100644 index fe6a2f3..0000000 --- a/spec-cleaner-1.2.2+5.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42ba51672d65038e7293a4e787f2bc1bdb5d4d64fbe3d6beba5d4c45db6c4735 -size 2773004 diff --git a/spec-cleaner-1.2.3+1.obscpio b/spec-cleaner-1.2.3+1.obscpio new file mode 100644 index 0000000..ab53294 --- /dev/null +++ b/spec-cleaner-1.2.3+1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:713fecc3440baf1bc60b1b3d0a5040833d88d16ffd8651892c5be05d537732a8 +size 2778636 diff --git a/spec-cleaner.changes b/spec-cleaner.changes index 46c7dd9..2c5abe3 100644 --- a/spec-cleaner.changes +++ b/spec-cleaner.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jul 8 10:51:00 UTC 2024 - Daniel Garcia + +- Update to version 1.2.3+1: + + Update rpmprep to handle %patchN for rpm >= 4.20 + + Do not embrace macros inside %python_module + + Use python-rpm-spec instead of calling rpmspec command + + Add %dnl to excludes-bracketing.txt +- Fix version number in package from github master + ------------------------------------------------------------------- Tue Apr 2 13:21:00 UTC 2024 - Dominique Leuenberger diff --git a/spec-cleaner.obsinfo b/spec-cleaner.obsinfo index 84accc4..68c0f14 100644 --- a/spec-cleaner.obsinfo +++ b/spec-cleaner.obsinfo @@ -1,4 +1,4 @@ name: spec-cleaner -version: 1.2.2+5 -mtime: 1709054721 -commit: 955cdcb1b9e6c72e216c4ae8a36662877dbb2f56 +version: 1.2.3+1 +mtime: 1720169521 +commit: bc35e1eb055ce06879f9c4c57b912c82f717a8e0 diff --git a/spec-cleaner.spec b/spec-cleaner.spec index 1e7b485..df653f9 100644 --- a/spec-cleaner.spec +++ b/spec-cleaner.spec @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 1.2.2+5 +Version: 1.2.3+1 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause @@ -28,7 +28,9 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-pip BuildRequires: python3-pytest +BuildRequires: python3-python-rpm-spec BuildRequires: python3-wheel +Requires: python3-python-rpm-spec # For the pkg_resources used in the binary loader BuildArch: noarch @@ -48,6 +50,8 @@ user to use spec-cleaner rather than to stick to perl based format_spec_file. %prep %autosetup -p1 +# Set correct package version, upstream has the next release number +sed -i 's/1\.2\.4/%{version}/g' spec_cleaner/__init__.py rm pytest.ini %build @@ -59,7 +63,12 @@ rm pytest.ini %check export LANG=en_US.UTF-8 -python3 -m pytest -k "not webtest" tests/*-tests.py +# Tests that requires network +donttest="webtest or url_https.spec" +# Tests that requires network because of make_secure_url checking that +# the secure url exists +donttest+=" or source_https or rpmpreamble.spec or replace_pwdutils.spec or mingw32-clutter.spec" +python3 -m pytest -k "not ($donttest)" tests/*-tests.py %install %if 0%{?mageia}