From a75f33edc5ec2529628b0376fd82315fb1b3f531 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 9 May 2022 15:20:48 +0200 Subject: [PATCH 01/11] Rebase to 1.1.16 --- .gitignore | 1 + ...t-Allow-help-and-version-even-on-uns.patch | 61 ------------------- servicelog.spec | 14 ++--- sources | 2 +- 4 files changed, 8 insertions(+), 70 deletions(-) delete mode 100644 0001-slog_common_event-Allow-help-and-version-even-on-uns.patch diff --git a/.gitignore b/.gitignore index d4c80ae..a79ceb8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ servicelog-1.1.7.tar.gz /servicelog-1.1.12.tar.gz /servicelog-1.1.14.tar.gz /servicelog-1.1.15.tar.gz +/servicelog-1.1.16.tar.gz diff --git a/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch b/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch deleted file mode 100644 index 446ce18..0000000 --- a/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c4b4aa2c79dc801311af6483079e6cb6a84d0919 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Wed, 28 Oct 2020 15:20:04 -0400 -Subject: [PATCH] slog_common_event: Allow --help and --version even on - unsupported platforms - -Signed-off-by: Stephen Gallagher ---- - src/slog_common_event.c | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - -diff --git a/src/slog_common_event.c b/src/slog_common_event.c -index a034511635a993330154578632b0824cbacddf18..970551cc9cf953e08a09309e655056f41152b50e 100644 ---- a/src/slog_common_event.c -+++ b/src/slog_common_event.c -@@ -77,20 +77,10 @@ main(int argc, char **argv) { - char *e=NULL, *s=NULL, *d=NULL, *l=NULL; - char desc[1024]; - servicelog *slog; - struct sl_event event; - uint64_t event_id; -- int platform = 0; -- -- platform = get_platform(); -- switch (platform) { -- case PLATFORM_UNKNOWN: -- case PLATFORM_POWERNV: -- fprintf(stderr, "%s is not supported on the %s platform\n", -- argv[0], __power_platform_name(platform)); -- exit(1); -- } - - for (;;) { - option_index = 0; - rc = getopt_long(argc, argv, "e:t:s:d:l:hvV", long_options, - &option_index); -@@ -135,10 +125,21 @@ main(int argc, char **argv) { - "(%s).\n", PACKAGE_BUGREPORT); - exit(1); - } - } - -+ int platform = 0; -+ -+ platform = get_platform(); -+ switch (platform) { -+ case PLATFORM_UNKNOWN: -+ case PLATFORM_POWERNV: -+ fprintf(stderr, "%s is not supported on the %s platform\n", -+ argv[0], __power_platform_name(platform)); -+ exit(1); -+ } -+ - if (e == NULL) { - if (verbose) { - fprintf(stderr, "The --event command-line argument is " - "required."); - } --- -2.28.0 - diff --git a/servicelog.spec b/servicelog.spec index a345d75..6fd867f 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog -Version: 1.1.15 -Release: 8%{?dist} +Version: 1.1.16 +Release: 1%{?dist} Summary: Servicelog Tools License: GPLv2 @@ -14,10 +14,6 @@ BuildRequires: autoconf libtool librtas-devel help2man # because of librtas-devel in libservicelog ExclusiveArch: ppc %{power64} -# Patch to work around build failing to generate manpages on PowerNV builders -# See https://github.com/power-ras/servicelog/pull/2 -Patch0001: 0001-slog_common_event-Allow-help-and-version-even-on-uns.patch - %description Command-line interfaces for viewing and manipulating the contents of the servicelog database. Contains entries that are useful @@ -25,8 +21,7 @@ for performing system service operations, and for providing a history of service operations that have been performed on the system. %prep -%setup -q -%patch0001 -p1 +%autosetup -p1 %build autoreconf -fiv @@ -51,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Mon May 09 2022 Than Ngo - 1.1.16-1 +- Rebase to 1.1.16 + * Sat Jan 22 2022 Fedora Release Engineering - 1.1.15-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 3f82b63..852fe55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (servicelog-1.1.15.tar.gz) = 5d5142aeb947133fb8ae77d5021790ab530d4614a8becf018342e1feeded2f64302343189d4bd4d684b096888aad6f45e08861404bcc5437abeac078fbbb7ac6 +SHA512 (servicelog-1.1.16.tar.gz) = 127329cd04cbcc83ea95614aff441e8efb5ba10c1befbf13ad9ed7fc2ca88f11b6390c2ed7843df7e56b848fb0066d85c0bf17e60b22885ed4266661012b34a0 From 1ec76e8626cb941fc330835e72b8048f370637b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:24:57 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index 6fd867f..2b4cc3c 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Servicelog Tools License: GPLv2 @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 09 2022 Than Ngo - 1.1.16-1 - Rebase to 1.1.16 From 40d33184e0be9b4b31ee9c231f1f0c0263420496 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:02:31 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index 2b4cc3c..d614119 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Servicelog Tools License: GPLv2 @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.1.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.1.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8e888f9ab363042e440b966df8d2bbaddfb8e223 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 16 Feb 2023 13:45:17 +0100 Subject: [PATCH 04/11] migrated to SPDX license --- servicelog.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/servicelog.spec b/servicelog.spec index d614119..b7b0a7c 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,9 +1,9 @@ Name: servicelog Version: 1.1.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Servicelog Tools -License: GPLv2 +License: GPL-2.0-only URL: https://github.com/power-ras/servicelog Source0: https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Thu Feb 16 2023 Than Ngo - 1.1.16-4 +- migrated to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 1.1.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 493b68b76595e79adbba1607946e719ce9baeb8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:27:15 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index b7b0a7c..aa64a7c 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Servicelog Tools License: GPL-2.0-only @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.1.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Feb 16 2023 Than Ngo - 1.1.16-4 - migrated to SPDX license From 6f0141ecaa2b2169601e57598fb13cf8ea3a705b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:39:18 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index aa64a7c..5cad622 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Servicelog Tools License: GPL-2.0-only @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.1.16-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.1.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 64bd681990c2f0fe50c70bc0e4582ac4c855f03b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:17:19 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index 5cad622..f25c239 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Servicelog Tools License: GPL-2.0-only @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.1.16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.1.16-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c8d7e9121fbd20ded9deb6f624a082774b3e65f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:27:01 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index f25c239..f4adb73 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Servicelog Tools License: GPL-2.0-only @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.1.16-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.1.16-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5ebc969136b275bd82b504899d47576a4cedb609 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:10:10 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index f4adb73..130b211 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Servicelog Tools License: GPL-2.0-only @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.1.16-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.1.16-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From bf81b8b7db64cd56570d851b50266944d430ae66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:54:52 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index 130b211..eb9f3aa 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Servicelog Tools License: GPL-2.0-only @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.1.16-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.1.16-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 48b3e28f46adff2dc1a0e3cd8fc51cada0a1ed01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:25:07 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- servicelog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servicelog.spec b/servicelog.spec index eb9f3aa..39e577a 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,6 +1,6 @@ Name: servicelog Version: 1.1.16 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Servicelog Tools License: GPL-2.0-only @@ -46,6 +46,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT %{_mandir}/man[18]/*.[18]* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.1.16-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.1.16-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild