import servicelog-1.1.16-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/servicelog-1.1.15.tar.gz
+SOURCES/servicelog-1.1.16.tar.gz

.servicelog.metadata

@@ -1 +1 @@
-e5ec1e132f2f4cf5a50b5ab8a45b6ef70eec9bab SOURCES/servicelog-1.1.15.tar.gz
+161d95d9584b2d4709e0848562767a7a7201cc75 SOURCES/servicelog-1.1.16.tar.gz

SOURCES/0001-slog_common_event-Allow-help-and-version-even-on-uns.patch

@@ -1,61 +0,0 @@
-From c4b4aa2c79dc801311af6483079e6cb6a84d0919 Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-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 <sgallagh@redhat.com>
----
- 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
-

SPECS/servicelog.spec

@@ -1,23 +1,19 @@
 Name:           servicelog
-Version:        1.1.15
-Release:        8%{?dist}
+Version:        1.1.16
+Release:        1%{?dist}
 Summary:        Servicelog Tools
 
 License:        GPLv2
 URL:            https://github.com/power-ras/servicelog
 Source0:        https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  libservicelog-devel >= 1.1.9-2
 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
+* Tue May 10 2022 Than Ngo <than@redhat.com> - 1.1.16-1
+- Resolves: #2050885, rebase to 1.1.16
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.15-8
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688