From cb3b16a7da7d6f5a96458e73720346ad6366f577faacedd63fbf08a4a1bfe539 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 21 Jan 2024 11:25:42 +0000 Subject: [PATCH 1/2] - Update to version 20240121: * Fix formatting of overlong tags * set header_name to the spec file name * Sync licenses with SPDX spec OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=207 --- _servicedata | 2 +- debian.dsc | 2 +- obs-service-format_spec_file-20230712.obscpio | 3 --- obs-service-format_spec_file-20240121.obscpio | 3 +++ obs-service-format_spec_file.changes | 8 ++++++++ obs-service-format_spec_file.obsinfo | 6 +++--- obs-service-format_spec_file.spec | 4 ++-- 7 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 obs-service-format_spec_file-20230712.obscpio create mode 100644 obs-service-format_spec_file-20240121.obscpio diff --git a/_servicedata b/_servicedata index 4edd07e..7d6deff 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - efca71ba4bea17efb09eb07f6154c1dc656bc208 \ No newline at end of file + 3011bbc97af4ff9ea4957ee98d8c5450155552ab \ No newline at end of file diff --git a/debian.dsc b/debian.dsc index dfc1f0b..e6fb86d 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20230712 +Version: 20240121 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20230712.obscpio b/obs-service-format_spec_file-20230712.obscpio deleted file mode 100644 index 128d3dc..0000000 --- a/obs-service-format_spec_file-20230712.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30c1bd782f4b3efbe39a9e24c588192ccb0f08083d6f87d0a1ed0d2bdca3c98a -size 1771020 diff --git a/obs-service-format_spec_file-20240121.obscpio b/obs-service-format_spec_file-20240121.obscpio new file mode 100644 index 0000000..56092ef --- /dev/null +++ b/obs-service-format_spec_file-20240121.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d298409aeb684aca4e073fd2581b3f397852cc590affa7ef772a2f4b78b1f4d +size 1780748 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 6a25d4d..3ae8acc 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jan 21 11:25:24 UTC 2024 - dmueller@suse.com + +- Update to version 20240121: + * Fix formatting of overlong tags + * set header_name to the spec file name + * Sync licenses with SPDX spec + ------------------------------------------------------------------- Wed Jul 12 11:16:06 UTC 2023 - dmueller@suse.com diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index eda39d7..d85a2aa 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file -version: 20230712 -mtime: 1689160500 -commit: efca71ba4bea17efb09eb07f6154c1dc656bc208 +version: 20240121 +mtime: 1705836294 +commit: 3011bbc97af4ff9ea4957ee98d8c5450155552ab diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index caa9b2b..320eacf 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-format_spec_file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20230712 +Version: 20240121 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only From c77aea9340490fa338e18317f100bef76ddae2e8cf5e975c68c5030d623fa0c7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 21 Jan 2024 11:35:49 +0000 Subject: [PATCH 2/2] * update licenses - do not enter empty license line if not found (eg in include file) (bnc#624980) - fix empty line handling (multiple subsequent empty lines) lines in a package, for example in if-constructs) - cleanup prepare_spec, drop Needed.pm OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=208 --- _servicedata | 2 +- obs-service-format_spec_file-20240121.obscpio | 4 ++-- obs-service-format_spec_file.changes | 11 ++++++----- obs-service-format_spec_file.obsinfo | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/_servicedata b/_servicedata index 7d6deff..c1a5a52 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/obs-service-format_spec_file.git - 3011bbc97af4ff9ea4957ee98d8c5450155552ab \ No newline at end of file + f8724f13e9c826cda97145f20facec9dbdc17536 \ No newline at end of file diff --git a/obs-service-format_spec_file-20240121.obscpio b/obs-service-format_spec_file-20240121.obscpio index 56092ef..85ff309 100644 --- a/obs-service-format_spec_file-20240121.obscpio +++ b/obs-service-format_spec_file-20240121.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d298409aeb684aca4e073fd2581b3f397852cc590affa7ef772a2f4b78b1f4d -size 1780748 +oid sha256:736e44bc5a209fbe4b28e41461cd4c6d1807c457c36bd8c750ffb10a5945173d +size 1781772 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 3ae8acc..f7ab720 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -2,6 +2,7 @@ Sun Jan 21 11:25:24 UTC 2024 - dmueller@suse.com - Update to version 20240121: + * update licenses * Fix formatting of overlong tags * set header_name to the spec file name * Sync licenses with SPDX spec @@ -218,7 +219,7 @@ Mon Aug 25 05:13:17 UTC 2014 - coolo@suse.com ------------------------------------------------------------------- Thu Aug 14 02:28:08 CEST 2014 - ro@suse.de -- do not enter empty license line if not found (eg in include file) +- do not enter empty license line if not found (eg in include file) ------------------------------------------------------------------- Wed Aug 13 11:21:40 CEST 2014 - ro@suse.de @@ -519,18 +520,18 @@ Mon Aug 8 14:05:45 UTC 2011 - ro@suse.com Mon Aug 1 17:29:28 CEST 2011 - ro@suse.de - try to keep summary and group for cases like openldap2 - (bnc#624980) + (bnc#624980) ------------------------------------------------------------------- Mon Jul 4 11:42:26 CEST 2011 - ro@suse.de -- fix empty line handling (multiple subsequent empty lines) +- fix empty line handling (multiple subsequent empty lines) ------------------------------------------------------------------- Mon Jul 4 00:16:05 CEST 2011 - ro@suse.de - leave Version lines intact (fix issue with multiple version - lines in a package, for example in if-constructs) + lines in a package, for example in if-constructs) ------------------------------------------------------------------- Fri Jun 17 07:27:18 UTC 2011 - coolo@novell.com @@ -556,7 +557,7 @@ Wed May 25 14:00:35 CEST 2011 - ro@suse.de ------------------------------------------------------------------- Wed May 4 01:55:04 CEST 2011 - ro@suse.de -- cleanup prepare_spec, drop Needed.pm +- cleanup prepare_spec, drop Needed.pm - make it ready for public usage ------------------------------------------------------------------- diff --git a/obs-service-format_spec_file.obsinfo b/obs-service-format_spec_file.obsinfo index d85a2aa..ba267d2 100644 --- a/obs-service-format_spec_file.obsinfo +++ b/obs-service-format_spec_file.obsinfo @@ -1,4 +1,4 @@ name: obs-service-format_spec_file version: 20240121 -mtime: 1705836294 -commit: 3011bbc97af4ff9ea4957ee98d8c5450155552ab +mtime: 1705836660 +commit: f8724f13e9c826cda97145f20facec9dbdc17536