9 changed files with 14 additions and 124 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1 @@
-libservicelog-1.1.9.tar.gz
-/libservicelog-1.1.11.tar.gz
-/libservicelog-1.1.13.tar.gz
-/libservicelog-1.1.14.tar.gz
-/libservicelog-1.1.15.tar.gz
-/libservicelog-1.1.16.tar.gz
-/libservicelog-1.1.17.tar.gz
-/libservicelog-1.1.18.tar.gz
-/libservicelog-1.1.19.tar.gz
+SOURCES/libservicelog-1.1.19.tar.gz
--- a/.libservicelog.metadata
+++ b/.libservicelog.metadata
@ -0,0 +1 @@
+16d0bb104213fe81da962d5a976faedb7fd431db SOURCES/libservicelog-1.1.19.tar.gz
--- a/SOURCES/libservicelog-1.1.9-libs.patch
+++ b/SOURCES/libservicelog-1.1.9-libs.patch
--- a/SPECS/libservicelog.spec
+++ b/SPECS/libservicelog.spec
@ -1,24 +1,18 @@
 Name:          libservicelog
 Version:       1.1.19
-Release:       15%{?dist}
+Release:       2%{?dist}
 Summary:       Servicelog Database and Library

+Group:       System Environment/Libraries
 #v29_notify_gram.c v29_notify_gram.h are GPLv2+
-License:       LGPL-2.0-only AND GPL-2.0-or-later
-
-URL:           https://github.com/power-ras/%{name}/releases
+License:       LGPLv2 and GPLv2+
+URL:           https://github.com/power-ras/%{name}
 Source:        https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-# sysusers.d config file
-Source1:       libservicelog.sysusers.conf
-
 # Link with needed libraries
 Patch0: libservicelog-1.1.9-libs.patch

-# sysusers_create_compat macro
-BuildRequires: systemd-rpm-macros
-%{?sysusers_requires_compat}
 BuildRequires: sqlite-devel autoconf libtool bison librtas-devel flex
-BuildRequires: make
+Requires(pre): shadow-utils

 # because of librtas-devel
 ExclusiveArch: ppc %{power64}
@ -32,6 +26,7 @@ the logging of service procedures that have been performed upon the system.

 %package       devel
 Summary:       Development files for %{name}
+Group:         Development/Libraries
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Requires:      pkgconfig sqlite-devel

@ -41,8 +36,7 @@ Contains header files for building with libservicelog.

 %prep
 %setup -q
-%patch 0 -p1 -b .libs
-
+%patch0 -p1 -b .libs

 %build
 autoreconf -fiv
@ -58,13 +52,9 @@ make CFLAGS="$CFLAGS" %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/*.la

-install -m0644 -D %{SOURCE1} %{buildroot}%{_sysusersdir}/libservicelog.conf
-
-%check
-make check || true

 %pre
-%sysusers_create_compat %{SOURCE1}
+getent group service >/dev/null || /usr/sbin/groupadd -r service

 %post -p /sbin/ldconfig

@ -77,7 +67,6 @@ make check || true
 %{_libdir}/libservicelog-*.so.*
 %dir %attr(755, root, service) /var/lib/servicelog
 %config(noreplace) %verify(not md5 size mtime) %attr(644,root,service) /var/lib/servicelog/servicelog.db
-%{_sysusersdir}/libservicelog.conf

 %files devel
 %{_includedir}/servicelog-1
@ -86,78 +75,11 @@ make check || true


 %changelog
-* Fri Apr 11 2025 Than Ngo <than@redhat.com> - 1.1.19-15
- Resolves: RHEL-86305, fixed gating
+* Tue Jun 01 2021 Than Ngo <than@redhat.com> - 1.1.19-2
+- Related: #1844430, fix URL

-
-* Thu Apr 10 2025 Than Ngo <than@redhat.com> - 1.1.19-14
- Manual creation of users and groups for old release
-  Resolves: RHEL-86305
-
-* Tue Apr 08 2025 Than Ngo <than@redhat.com> - 1.1.19-13
- Add sysusers.d config file to allow rpm to create users/groups automatically
-  Resolves: RHEL-86305
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.1.19-12
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.1.19-11
- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Mar 28 2023 Than Ngo <than@redhat.com> - 1.1.19-7
- Fixed patch rpm macro
-
-* Thu Feb 16 2023 Than Ngo <than@redhat.com> - 1.1.19-6
- migrated to SPDX license
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 28 2021 Than Ngo <than@redhat.com> - 1.1.19-1
- Rebase to 1.1.19
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Dec 02 2019 Than Ngo <than@redhat.com> - 1.1.18-7
- Update Url and Source
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed May 29 2019 Than Ngo <than@redhat.com> - 1.1.18-5
- enable tests
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Jun 01 2021 Than Ngo <than@redhat.com> - 1.1.19-1
+- Resolves: #1844430, rebase to 1.1.19

 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/libservicelog.sysusers.conf
+++ b/libservicelog.sysusers.conf
@ -1 +0,0 @@
-g service -
--- a/plans/tier1.fmf
+++ b/plans/tier1.fmf
@ -1,16 +0,0 @@
---
-
-summary: Tier1 plan for libservicelog
-
-discover:
-  how: fmf
-  url: https://pkgs.devel.redhat.com/git/tests/libservicelog
-  ref: master
-  filter: tier:1
-
-execute:
-  how: tmt
-
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (libservicelog-1.1.19.tar.gz) = 71ecd7ef59a30fff6336621d279d33520d2d772445af0382609cbe4f311dbe31f35b4e03b3cfe918a9793b065400e0004188f5a5635a0ff71e62cd4d2e78ad66
				`@ -0,0 +1 @@`
				`16d0bb104213fe81da962d5a976faedb7fd431db SOURCES/libservicelog-1.1.19.tar.gz`
				`@ -1 +0,0 @@`
				`SHA512 (libservicelog-1.1.19.tar.gz) = 71ecd7ef59a30fff6336621d279d33520d2d772445af0382609cbe4f311dbe31f35b4e03b3cfe918a9793b065400e0004188f5a5635a0ff71e62cd4d2e78ad66`