diff --git a/_service b/_service new file mode 100644 index 0000000..1a9807a --- /dev/null +++ b/_service @@ -0,0 +1,19 @@ + + + + git + https://github.com/rpm-software-management/spec-cleaner.git + master + @PARENT_TAG@+@TAG_OFFSET@ + (spec-cleaner-)?(.*)(\+0)? + \2 + + + + + *.tar + zst + + + + diff --git a/fix_tests_needing_web_connection.patch b/fix_tests_needing_web_connection.patch deleted file mode 100644 index f29e98f..0000000 --- a/fix_tests_needing_web_connection.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- - tests/in/mingw32-clutter.spec | 2 +- - tests/in/replace_pwdutils.spec | 2 +- - tests/out-minimal/mingw32-clutter.spec | 2 +- - tests/out-minimal/replace_pwdutils.spec | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - ---- a/tests/in/mingw32-clutter.spec -+++ b/tests/in/mingw32-clutter.spec -@@ -22,7 +22,7 @@ Release: 0 - Summary: The clutter library - License: LGPL-2.1+ - Group: Development/Libraries --Url: http://clutter-project.org/ -+Url: https://clutter-project.org/ - Source: http://www.clutter-project.org/sources/clutter/1.5/clutter-%{version}.tar.bz2 - Patch0: clutter-1.6.14-windows.patch - Patch1: clutter-1.6.20-ldl.patch ---- a/tests/in/replace_pwdutils.spec -+++ b/tests/in/replace_pwdutils.spec -@@ -4,7 +4,7 @@ Release: 0 - Summary: A Job Manager - License: GPL-2.0-or-later - Group: System/Daemons --URL: http://ftp.debian.org/debian/pool/main/a/at -+URL: https://ftp.debian.org/debian/pool/main/a/at - Source: http://ftp.debian.org/debian/pool/main/a/at/%{name}_%{version}.orig.tar.gz - BuildRequires: autoconf >= 2.69 - BuildRequires: automake ---- a/tests/out-minimal/mingw32-clutter.spec -+++ b/tests/out-minimal/mingw32-clutter.spec -@@ -23,7 +23,7 @@ Release: 0 - Summary: The clutter library - License: LGPL-2.1-or-later - Group: Development/Libraries --URL: http://clutter-project.org/ -+URL: https://clutter-project.org/ - Source: http://www.clutter-project.org/sources/clutter/1.5/clutter-%{version}.tar.bz2 - Patch0: clutter-1.6.14-windows.patch - Patch1: clutter-1.6.20-ldl.patch ---- a/tests/out-minimal/replace_pwdutils.spec -+++ b/tests/out-minimal/replace_pwdutils.spec -@@ -4,7 +4,7 @@ Release: 0 - Summary: A Job Manager - License: GPL-2.0-or-later - Group: System/Daemons --URL: http://ftp.debian.org/debian/pool/main/a/at -+URL: https://ftp.debian.org/debian/pool/main/a/at - Source: http://ftp.debian.org/debian/pool/main/a/at/%{name}_%{version}.orig.tar.gz - BuildRequires: autoconf >= 2.69 - BuildRequires: automake diff --git a/spec-cleaner-1.2.2+5.obscpio b/spec-cleaner-1.2.2+5.obscpio new file mode 100644 index 0000000..fe6a2f3 --- /dev/null +++ b/spec-cleaner-1.2.2+5.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42ba51672d65038e7293a4e787f2bc1bdb5d4d64fbe3d6beba5d4c45db6c4735 +size 2773004 diff --git a/spec-cleaner-1.2.2.tar.gz b/spec-cleaner-1.2.2.tar.gz deleted file mode 100644 index 3d9b68a..0000000 --- a/spec-cleaner-1.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d70be37326a29b8e4f391c6e9060e1f8f051942dd986ae3889f8fd2f3d8d0cd -size 522881 diff --git a/spec-cleaner.changes b/spec-cleaner.changes index 3e37f02..46c7dd9 100644 --- a/spec-cleaner.changes +++ b/spec-cleaner.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 2 13:21:00 UTC 2024 - Dominique Leuenberger + +- Update to version 1.2.2+5: + + Fix mingw32-clutter and replace_pwdutils tests. + + Update rpmprep to handle %patchN for rpm >= 4.20. +- Drop fix_tests_needing_web_connection.patch: fixed upstream. +- Convert to obs_scm service: there is no bootstrapping needed for + the tarball anyway, so using pristine git checkout is preferred. + ------------------------------------------------------------------- Thu Oct 26 11:54:41 UTC 2023 - Matej Cepl diff --git a/spec-cleaner.obsinfo b/spec-cleaner.obsinfo new file mode 100644 index 0000000..84accc4 --- /dev/null +++ b/spec-cleaner.obsinfo @@ -0,0 +1,4 @@ +name: spec-cleaner +version: 1.2.2+5 +mtime: 1709054721 +commit: 955cdcb1b9e6c72e216c4ae8a36662877dbb2f56 diff --git a/spec-cleaner.spec b/spec-cleaner.spec index 2b38f84..1e7b485 100644 --- a/spec-cleaner.spec +++ b/spec-cleaner.spec @@ -1,7 +1,7 @@ # # spec file for package spec-cleaner # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2012 Vincent Untz # # All modifications and additions to the file contributed by third parties @@ -18,14 +18,12 @@ Name: spec-cleaner -Version: 1.2.2 +Version: 1.2.2+5 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause URL: https://github.com/rpm-software-management/spec-cleaner -Source0: https://github.com/rpm-software-management/spec-cleaner/archive/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM: https://github.com/rpm-software-management/spec-cleaner/commit/fd0f64930a399dfcf4ff5d3e22a8ec9afa37043a -Patch0: fix_tests_needing_web_connection.patch +Source0: %{name}-%{version}.tar.zst BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-pip @@ -49,7 +47,7 @@ Alternative provider of format_spec_file functionality in order to allow user to use spec-cleaner rather than to stick to perl based format_spec_file. %prep -%autosetup -p1 -n %{name}-%{name}-%{version} +%autosetup -p1 rm pytest.ini %build @@ -79,7 +77,7 @@ python3 -m pytest -k "not webtest" tests/*-tests.py %{_prefix}/lib/obs/service/clean_spec_file %{_prefix}/lib/obs/service/clean_spec_file.service %{python3_sitelib}/spec_cleaner -%{python3_sitelib}/spec_cleaner-%{version}*-info +%{python3_sitelib}/spec_cleaner-*-info %{_datadir}/%{name} %files format_spec_file