From e3c7b362cfc508f18869e65e1e0ab304dda541082458844c24ad5dc39c09418b Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.com>
Date: Fri, 16 Jul 2021 08:42:22 +0000
Subject: [PATCH] Accepting request 906613 from
 home:jengelh:branches:devel:libraries:c_c++

- Drop --with-pic, has no effect with --disable-static.
- Replace PreReq with Requires(pre).
- Do not ignore error return from useradd.

OBS-URL: https://build.opensuse.org/request/show/906613
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=42
---
 libservicelog.changes |  7 +++++++
 libservicelog.spec    | 23 ++++++++++-------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/libservicelog.changes b/libservicelog.changes
index 598fa37..d8f17c1 100644
--- a/libservicelog.changes
+++ b/libservicelog.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 15 18:57:56 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Drop --with-pic, has no effect with --disable-static.
+- Replace PreReq with Requires(pre).
+- Do not ignore error return from useradd.
+
 -------------------------------------------------------------------
 Thu Jul 15 15:54:56 UTC 2021 - Michal Suchanek <msuchanek@suse.com>
 
diff --git a/libservicelog.spec b/libservicelog.spec
index 653f554..4b927cd 100644
--- a/libservicelog.spec
+++ b/libservicelog.spec
@@ -22,7 +22,7 @@ Version:        1.1.19
 Release:        0
 Summary:        Servicelog Database and Library
 License:        LGPL-2.0-or-later
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
 URL:            https://github.com/power-ras/libservicelog/
 
 #Git-Clone:	https://github.com/power-ras/libservicelog.git
@@ -30,14 +30,13 @@ URL:            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
-PreReq:         %{_sbindir}/groupadd
+Requires(pre):  %{_sbindir}/groupadd
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  librtas-devel
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  sqlite3-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  ppc ppc64 ppc64le
 
 %description
@@ -61,44 +60,42 @@ system.
 
 %package        devel
 Summary:        Development files for libservicelog
-Group:          Development/Libraries/Other
+Group:          Development/Libraries/C and C++
 Requires:       %lname = %version
 Requires:       glibc-devel
 Requires:       sqlite3-devel
 
 %description    devel
-Contains header files for building with libservicelog.
+Header files for building with libservicelog.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 autoreconf -fiv
-%configure --with-pic --disable-static
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 %make_install
-%__rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/*.la
 
 %pre
-/usr/sbin/groupadd -r service || echo groupadd service failed
+getent group service >/dev/null || %{_sbindir}/groupadd -r service
 
 %post    -n %lname -p /sbin/ldconfig
 %postun  -n %lname -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS
+%license COPYING
+%doc AUTHORS
 %attr( 754, root, service ) %dir /var/lib/servicelog
 %attr( 644, root, service ) /var/lib/servicelog/servicelog.db
 
 %files -n %lname
-%defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/servicelog-1
 %{_libdir}/pkgconfig/servicelog-1.pc
 %{_libdir}/*.so