dgarcia/spec-cleaner
SHA256
1
0
Fork 0
forked from pool/spec-cleaner
Code Pull Requests 2 Actions Activity

Accepting request 1164119 from home:dimstar:Factory

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/1164119
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/spec-cleaner?expand=0&rev=165
This commit is contained in:
Daniel Garcia 2024-04-10 11:06:04 +00:00 committed by Git OBS Bridge
parent 7dee1f31da
commit 99bf117013
7 changed files with 41 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
_service Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/rpm-software-management/spec-cleaner.git</param>
<param name="revision">master</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(spec-cleaner-)?(.*)(\+0)?</param>
<param name="versionrewrite-replacement">\2</param>
<!-- <param name="changesgenerate">enable</param> -->
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">zst</param>
</service>
<service name="set_version" mode="manual" />
</services>

51
fix_tests_needing_web_connection.patch
View File

@ -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

BIN
spec-cleaner-1.2.2+5.obscpio (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
spec-cleaner-1.2.2.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

10
spec-cleaner.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Apr 2 13:21:00 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- 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 <mcepl@cepl.eu>

4
spec-cleaner.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: spec-cleaner
version: 1.2.2+5
mtime: 1709054721
commit: 955cdcb1b9e6c72e216c4ae8a36662877dbb2f56

12
spec-cleaner.spec
View File

@ -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 <vuntz@opensuse.org>
#
# 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