diff --git a/.gitignore b/.gitignore index a79ceb8..d4c80ae 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ 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 new file mode 100644 index 0000000..446ce18 --- /dev/null +++ b/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch @@ -0,0 +1,61 @@ +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 39e577a..a345d75 100644 --- a/servicelog.spec +++ b/servicelog.spec @@ -1,9 +1,9 @@ Name: servicelog -Version: 1.1.16 -Release: 11%{?dist} +Version: 1.1.15 +Release: 8%{?dist} Summary: Servicelog Tools -License: GPL-2.0-only +License: GPLv2 URL: https://github.com/power-ras/servicelog Source0: https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -14,6 +14,10 @@ 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 @@ -21,7 +25,8 @@ for performing system service operations, and for providing a history of service operations that have been performed on the system. %prep -%autosetup -p1 +%setup -q +%patch0001 -p1 %build autoreconf -fiv @@ -46,39 +51,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 852fe55..3f82b63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (servicelog-1.1.16.tar.gz) = 127329cd04cbcc83ea95614aff441e8efb5ba10c1befbf13ad9ed7fc2ca88f11b6390c2ed7843df7e56b848fb0066d85c0bf17e60b22885ed4266661012b34a0 +SHA512 (servicelog-1.1.15.tar.gz) = 5d5142aeb947133fb8ae77d5021790ab530d4614a8becf018342e1feeded2f64302343189d4bd4d684b096888aad6f45e08861404bcc5437abeac078fbbb7ac6