Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libservicelog for openSUSE:Factory
checked in at 2023-10-27 22:28:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libservicelog (Old)
and /work/SRC/openSUSE:Factory/.libservicelog.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libservicelog"
Fri Oct 27 22:28:59 2023 rev:32 rq:1120764 version:1.1.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/libservicelog/libservicelog.changes
2021-07-16 22:13:28.666518317 +0200
+++ /work/SRC/openSUSE:Factory/.libservicelog.new.17445/libservicelog.changes
2023-10-27 22:29:40.622779781 +0200
@@ -1,0 +2,5 @@
+Thu Oct 26 15:11:01 UTC 2023 - Michal Suchanek <msucha...@suse.com>
+
+- Use sysuser-tools package instead of creating the group (bsc#1216613)
+
+-------------------------------------------------------------------
New:
----
system-group-service.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libservicelog.spec ++++++
--- /var/tmp/diff_new_pack.bs8CTI/_old 2023-10-27 22:29:41.078796506 +0200
+++ /var/tmp/diff_new_pack.bs8CTI/_new 2023-10-27 22:29:41.078796506 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libservicelog
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,28 +16,37 @@
#
-Name: libservicelog
%define lname libservicelog-1_1-1
+%if 0%{?suse_version} < 1500
+%global system_user_pkg 0
+%else
+%global system_user_pkg 1
+%endif
+Name: libservicelog
Version: 1.1.19
Release: 0
Summary: Servicelog Database and Library
License: LGPL-2.0-or-later
Group: Development/Libraries/C and C++
URL: https://github.com/power-ras/libservicelog/
-
#Git-Clone: https://github.com/power-ras/libservicelog.git
#Git-Web: https://github.com/power-ras/libservicelog/
Source0:
https://github.com/power-ras/libservicelog/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf
Source2: libservicelog-rpmlintrc
-Requires(pre): %{_sbindir}/groupadd
+Source3: system-group-service.conf
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: librtas-devel
BuildRequires: libtool
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: sqlite3-devel
ExclusiveArch: ppc ppc64 ppc64le
+%if %{system_user_pkg}
+Requires(pre): sysuser-tools
+%else
+Requires(pre): %{_sbindir}/groupadd
+%endif
%description
The libservicelog package contains a library to create and maintain a
@@ -46,12 +55,12 @@
the logging of service procedures that have been performed upon the
system.
-%package -n %lname
+%package -n %{lname}
Summary: Servicelog Database and Library
Group: System/Libraries
-Requires: %name
+Requires: %{name}
-%description -n %lname
+%description -n %{lname}
The libservicelog package contains a library to create and maintain a
database for storing events related to system service. This database
allows for the logging of serviceable and informational events, and for
@@ -61,7 +70,7 @@
%package devel
Summary: Development files for libservicelog
Group: Development/Libraries/C and C++
-Requires: %lname = %version
+Requires: %{lname} = %{version}
Requires: glibc-devel
Requires: sqlite3-devel
@@ -75,24 +84,36 @@
autoreconf -fiv
%configure --disable-static
make %{?_smp_mflags}
+%if %{system_user_pkg}
+%sysusers_generate_pre %{SOURCE3} libservicelog system-group-service.conf
+%else
+cat > libservicelog.pre <<EOF
+getent group service >/dev/null || %{_sbindir}/groupadd -r service
+EOF
+%endif
%install
%make_install
-rm -f %{buildroot}/%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
+%if %{system_user_pkg}
+install -m 0644 -D -t %{buildroot}%{_sysusersdir}/ %{SOURCE3}
+%endif
-%pre
-getent group service >/dev/null || %{_sbindir}/groupadd -r service
+%pre -f libservicelog.pre
-%post -n %lname -p /sbin/ldconfig
-%postun -n %lname -p /sbin/ldconfig
+%post -n %{lname} -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
%files
%license COPYING
%doc AUTHORS
-%attr( 754, root, service ) %dir /var/lib/servicelog
-%attr( 644, root, service ) /var/lib/servicelog/servicelog.db
+%attr( 754, root, service ) %dir %{_localstatedir}/lib/servicelog
+%attr( 644, root, service ) %{_localstatedir}/lib/servicelog/servicelog.db
+%if %{system_user_pkg}
+%{_sysusersdir}/system-group-service.conf
+%endif
-%files -n %lname
+%files -n %{lname}
%{_libdir}/lib*.so.*
%files devel
++++++ system-group-service.conf ++++++
# Type Name ID GECOS [HOME]
# Access to certain kernel and userspace facilities
g service - -
