Accepting request 974625 from home:favogt:branches:Base:System

- Replace invalid use of chrpath with patching out -static (boo#1199134)
- Mention the sonum in %files
- Drop meanwhile unnecessary libsmbios-rpmlintrc

OBS-URL: https://build.opensuse.org/request/show/974625
OBS-URL: https://build.opensuse.org/package/show/Base:System/libsmbios?expand=0&rev=54

libsmbios-rpmlintrc

@@ -1 +0,0 @@
-addFilter("E: shlib-policy-name-error")

libsmbios.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May  3 07:24:33 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Replace invalid use of chrpath with patching out -static (boo#1199134)
+- Mention the sonum in %files
+- Drop meanwhile unnecessary libsmbios-rpmlintrc
+
 -------------------------------------------------------------------
 Fri Jul 09 12:52:41 UTC 2021 - trenn@suse.de
 

libsmbios.obsinfo

@@ -2,4 +2,3 @@ name: libsmbios
 version: 2.4.3.3.gf01a217
 mtime: 1609786060
 commit: f01a21763180c9c11d70326ad36b9761cde9131c
-

libsmbios.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libsmbios
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,8 @@
 #
 
 
-%define libname libsmbios_c2
+%define sonum 2
+%define libname libsmbios_c%{sonum}
 Name:           libsmbios
 Version:        2.4.3.3.gf01a217
 Release:        0
@@ -25,10 +26,8 @@ License:        GPL-2.0-or-later OR OSL-2.1
 Group:          Hardware/Other
 URL:            https://github.com/dell/libsmbios
 Source:         %{name}-%{version}.tar.gz
-Source1:        %{name}-rpmlintrc
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  chrpath
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -119,6 +118,8 @@ programs against libsmbios.
 
 %prep
 %autosetup -p1
+# That conflicts with --disable-static
+sed -i"" "s/ -static//" src/bin/Makefile.am
 
 %build
 autoreconf -fvi
@@ -137,9 +138,6 @@ export LDFLAGS="-pie"
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-# remove rpath from binaries
-chrpath --replace '$ORIGIN' %{buildroot}%{_sbindir}/smbios-sys-info-lite
-
 # python3 duplicates
 %fdupes %{buildroot}%{python3_sitearch}
 
@@ -168,6 +166,7 @@ ln -s smbios-lcd-brightness %{buildroot}/%{_sbindir}/dellLcdBrightness
 %files -n %{libname}
 %license COPYING-GPL COPYING-OSL
 %license src/bin/getopts_LICENSE.txt
+%{_libdir}/libsmbios_c.so.%{sonum}
 %{_libdir}/libsmbios_c.so.*
 %{_datadir}/locale/en/