Accepting request 590769 from home:1Antoine1:branches:Base:System

- Update to 2.4.1:
  * Minor fixes submitted for help2man improvements and a signed
    comparison.
- Changes in 2.4.0:
  * Convert all python2 -> python3.
  * Drop libsmbios C++ library.
  * Introduce support for WMI SMM API provided by Linux kernel
    4.15+.
  * Add proper support for SMBIOS 3.0 tables.
  * Fix many many crashers.
  * Clean up long standing coverity errors.

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

libsmbios-2.3.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff0fbcc5fd581772aaabcde1a998b774da70fd87e2934a19fd7d61e60ab5245d
-size 872617

libsmbios-2.4.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bca36af54a169eafeda19463e100378b26b1845d90dfd2fcb41cbd05a632f015
+size 435512

libsmbios.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Mar 22 19:45:36 UTC 2018 - antoine.belvire@opensuse.org
+
+- Update to 2.4.1:
+  * Minor fixes submitted for help2man improvements and a signed
+    comparison.
+- Changes in 2.4.0:
+  * Convert all python2 -> python3.
+  * Drop libsmbios C++ library.
+  * Introduce support for WMI SMM API provided by Linux kernel
+    4.15+.
+  * Add proper support for SMBIOS 3.0 tables.
+  * Fix many many crashers.
+  * Clean up long standing coverity errors.
+
 -------------------------------------------------------------------
 Fri Feb 23 15:36:12 UTC 2018 - josef.moellers@suse.com
 

libsmbios.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libsmbios
 #
-# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,12 @@
 
 # these are all substituted by autoconf
 %define major 2
-%define minor 3
+%define minor 4
-%define micro 3
+%define micro 1
 %define extra %{nil}
 %define pot_file  libsmbios
-%define lang_dom  libsmbios-2.3-x86_64
+%define lang_dom  libsmbios-2.4-x86_64
-%define release_version 2.3.3
+%define release_version 2.4.1
 
 %define release_name libsmbios
 %define other_name   libsmbios2
@@ -35,87 +35,50 @@
 %{!?build_python:   %global build_python 1}
 %{?_with_python:    %global build_python 1}
 %{?_without_python: %undefine build_python}
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-# %%define debug_package %%{nil}
 
 # run_unit_tests not defined by default as cppunit
 # not available in OS on several major OS
 %{?_without_unit_tests: %undefine run_unit_tests}
-%{?_with_unit_tests:    %define run_unit_tests 1}
+%{?_with_unit_tests:    %global run_unit_tests 1}
 
 %{!?as_needed:         %global as_needed 1}
 %{?_without_as_needed: %undefine as_needed}
 %{?_with_as_needed:    %global as_needed 1}
 
-%define cppunit_BR cppunit-devel
+%global pkgconfig_BR pkgconfig
-%define pkgconfig_BR pkgconfig
+%global valgrind_BR valgrind
-%define ctypes_BR python-ctypes
-%define valgrind_BR valgrind
 # Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
 # SUSE: fedora_version  suse_version rhel_version centos_version sles_version
 # Fedora: fedora dist fc8 fc9
 
-# suse/sles
+%global python_devel_BR %{nil}
-%if 0%{?suse_version}
-%if 0%{?suse_version} < 1000
-    %define valgrind_BR %{nil}
-    # sles 9 doesnt have as_needed
-    %undefine as_needed
-%endif
-%if 0%{?suse_version} >= 1020
-    # suse never added python-ctypes provides to python 2.5 :(
-    %define ctypes_BR %{nil}
-%endif
-%endif
-
-# rhel (should work on OBS and EPEL)
-%if 0%{?rhel}
-%if 0%{?rhel} < 4
-    # dont yet have rhel3 valgrind
-    %define valgrind_BR %{nil}
-    # no python-ctypes for python <= 2.2
-    %undefine build_python
-    # rhel3 doesnt have -as-needed
-    %undefine as_needed
-%endif
-%endif
-
-%define python_devel_BR %{nil}
 %if 0%{?build_python}
-    %define python_devel_BR %{pythons}
+    %global python_devel_BR python3-devel
-    # per fedora and suse python packaging guidelines
-    # suse: will define py_sitedir for us
-    # fedora: use the !? code below to define when it isnt already
-
-    # pure python stuff goes here
-    %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-
-    # arch-dep python stuff goes here
-    %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
 %endif
 
 # if unit tests are disabled, get rid of a few BuildRequires
-%{!?run_unit_tests: %global cppunit_BR %{nil}}
 %{!?run_unit_tests: %global valgrind_BR %{nil}}
 
 Name:           %{release_name}
 Version:        %{release_version}
-Release:        3.1%{?dist}
+Release:        0%{?dist}
 Summary:        Libsmbios C shared libraries
-License:        GPL-2.0+ or OSL-2.1
+License:        GPL-2.0-or-later OR OSL-2.1
 Group:          System/Libraries
-Source:         libsmbios-%{version}.tar.bz2
+Source:         libsmbios-%{version}.tar.xz
 Source1:        libsmbios.rpmlintrc
 Url:            http://github.com/dell/libsmbios
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gettext-devel
+BuildRequires:  libtool
 BuildRequires:  python-rpm-macros
-BuildRequires:  strace libxml2-devel gcc-c++ gettext doxygen %{valgrind_BR} %{cppunit_BR} %{pkgconfig_BR} %{pythons}
+BuildRequires:  strace libxml2-devel gcc-c++ gettext doxygen help2man %{valgrind_BR} %{pkgconfig_BR} %{python_devel_BR}
 # uncomment for official fedora
 Obsoletes:      libsmbios-libs < 2.0.0
 Provides:       libsmbios-libs = 0:%{version}-%{release}
 Obsoletes:      %{other_name} < 0:%{version}-%{release}
-
 Provides:       %{other_name} = 0:%{version}-%{release}
 
 # libsmbios only ever makes sense on intel compatible arches
@@ -123,7 +86,7 @@ Provides:       %{other_name} = 0:%{version}-%{release}
 ExclusiveArch:  x86_64 ia64 %{ix86}
 
 %description
-This package is a library and utilities that can be used by client programs to get
+Libsmbios is a library and utilities that can be used by client programs to get
 information from standard BIOS tables, such as the SMBIOS table.
 
 This package provides the C-based libsmbios library, with a C interface.
@@ -132,7 +95,7 @@ This package provides the C-based libsmbios library, with a C interface.
 Summary:        Python interface to Libsmbios C library
 Group:          System/Libraries
 Requires:       %{release_name} = %{version}-%{release}
-Requires:       python %{ctypes_BR}
+Requires:       python3
 
 %description -n python-smbios
 This package provides a Python interface to libsmbios
@@ -202,7 +165,7 @@ programs against libsmbios.
 %setup -q -n libsmbios-%{version}
 find . -type d -exec chmod -f 755 {} \;
 find doc src -type f -exec chmod -f 644 {} \;
-find ./src/cppunit/ -name "*.sh" -type f -exec chmod 755  '{}' \;
+find ./src/pyunit/ -name "*.sh" -o -name "*.py" -type f -exec chmod 755  '{}' \;
 
 %build
 # this line lets us build an RPM directly from a git tarball
@@ -218,7 +181,7 @@ chmod +x ./configure
     %{?!as_needed:--disable-as-needed} %{?!build_python:--disable-python}
 
 mkdir -p out/libsmbios_c
-make CFLAGS="-Werror" %{?_smp_mflags} OPT="$RPM_OPT_FLAGS" 2>&1 | tee build-%{_arch}.log
+make CFLAGS="-Werror %{optflags}" %{?_smp_mflags} 2>&1 | tee build-%{_arch}.log
 
 echo \%doc _build/build-%{_arch}.log > buildlogs.txt
 
@@ -236,22 +199,9 @@ runtest() {
 %endif
 }
 
-if [ -d /usr/include/cppunit ]; then
+VALGRIND="strace -f" runtest check strace > /dev/null || echo FAILED strace check
-   # run this first since it is slightly faster than valgrind
+runtest valgrind > /dev/null || echo FAILED valgrind check
-    VALGRIND="strace -f" runtest check strace > /dev/null || echo FAILED strace check
+runtest check > /dev/null || echo FAILED check
-fi
-
-if [ -e /usr/bin/valgrind -a -d /usr/include/cppunit ]; then
-    runtest valgrind > /dev/null || echo FAILED valgrind check
-fi
-
-if [ -d /usr/include/cppunit ]; then
-    runtest check > /dev/null || echo FAILED check
-fi
-
-if [ ! -d /usr/include/cppunit ]; then
-    echo "Unit tests skipped due to missing cppunit."
-fi
 
 %install
 rm -rf %{buildroot}
@@ -264,7 +214,7 @@ mkdir -p %{buildroot}/%{_includedir}
 mkdir -p %{buildroot}/%{_bindir}
 cp -a $TOPDIR/src/include/*  %{buildroot}/%{_includedir}/
 cp -a out/public-include/*  %{buildroot}/%{_includedir}/
-rm -f %{buildroot}/%{_libdir}/lib*.{la,a}
+rm -f %{buildroot}/%{_libdir}/libsmbios*.*a
 find %{buildroot}/%{_includedir} out/libsmbios_c -exec touch -r $TOPDIR/configure.ac {} \;
 
 mv out/libsmbios_c    out/libsmbios_c-%{_arch}
@@ -285,10 +235,9 @@ ln -s smbios-sys-info %{buildroot}/%{_sbindir}/getSystemId
 ln -s smbios-wireless-ctl %{buildroot}/%{_sbindir}/dellWirelessCtl
 ln -s smbios-lcd-brightness %{buildroot}/%{_sbindir}/dellLcdBrightness
 
-%python_expand sitelib=%{$python_sitelib}
 cat > files-python-smbios <<-EOF
 	%doc COPYING-GPL COPYING-OSL
-	$sitelib/*
+	%{python3_sitearch}/*
 EOF
 
 cat > files-smbios-utils-python <<-EOF
@@ -308,6 +257,9 @@ cat > files-smbios-utils-python <<-EOF
 	%{_sbindir}/smbios-thermal-ctl
 	%{_sbindir}/smbios-battery-ctl
 
+	# man pages
+	%{_mandir}/man1/smbios*
+
 	# used by HAL in old location, so keep it around until HAL is updated.
 	%{_sbindir}/dellLcdBrightness
 	%{_sbindir}/getSystemId