[packages/libsmbios] - updated to 2.4.1 - C++ library is gone - python 2 plugin replaced by python3; yum plugin is gone

qboosh qboosh at pld-linux.org
Sat Apr 21 22:01:53 CEST 2018 

commit 19e2795a3bcb1ed8b8dca254376a58a4b160124e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 21 22:02:10 2018 +0200

    - updated to 2.4.1
    - C++ library is gone
    - python 2 plugin replaced by python3; yum plugin is gone

 libsmbios-sh.patch |  8 +++---
 libsmbios.spec     | 73 ++++++++++++++++--------------------------------------
 2 files changed, 26 insertions(+), 55 deletions(-)
---
diff --git a/libsmbios.spec b/libsmbios.spec
index cc954e5..0ccf940 100644
--- a/libsmbios.spec
+++ b/libsmbios.spec
@@ -1,13 +1,13 @@
 Summary:	Open BIOS parsing library
 Summary(pl.UTF-8):	Biblioteka analizująca Open BIOS
 Name:		libsmbios
-Version:	2.3.3
+Version:	2.4.1
 Release:	1
 License:	OSL v2.1 or GPL v2+
 Group:		Libraries
 #Source0Download: https://github.com/dell/libsmbios/releases
 Source0:	https://github.com/dell/libsmbios/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	8abcce9e2024b9ff393db7d1fdcc3989
+# Source0-md5:	abaa2c4f94945c22d667ef741e422630
 Patch0:		%{name}-sh.patch
 Patch1:		%{name}-link.patch
 URL:		https://github.com/dell/libsmbios
@@ -16,11 +16,11 @@ BuildRequires:	automake >= 1.6
 BuildRequires:	cppunit-devel >= 1.9.6
 BuildRequires:	doxygen
 BuildRequires:	gettext-tools >= 0.14
-BuildRequires:	libstdc++-devel
+BuildRequires:	help2man
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
-BuildRequires:	python >= 1:2.3
+BuildRequires:	python3 >= 1:3.2
 BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	sed >= 4.0
 ExclusiveArch:	%{ix86} %{x8664} x32
@@ -41,7 +41,7 @@ Summary:	libsmbios tools
 Summary(pl.UTF-8):	Narzędzia libsmbios
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
-Requires:	python-libsmbios = %{version}-%{release}
+Requires:	python3-libsmbios = %{version}-%{release}
 
 %description progs
 libsmbios tools.
@@ -56,7 +56,6 @@ Summary(ru.UTF-8):	Хедеры для разработки программ с
 Summary(uk.UTF-8):	Хедери для розробки програм з використанням libsmbios
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libstdc++-devel
 
 %description devel
 Header files and development documentation for libsmbios.
@@ -91,33 +90,20 @@ libsmbios.
 %description static -l uk.UTF-8
 Статичні бібліотеки для розробки програм з використанням libsmbios.
 
-%package -n python-libsmbios
-Summary:	Python interface to libsmbios C library
-Summary(pl.UTF-8):	Interfejs Pythona do biblioteki C libsmbios
+%package -n python3-libsmbios
+Summary:	Python 3 interface to libsmbios C library
+Summary(pl.UTF-8):	Interfejs Pythona 3 do biblioteki C libsmbios
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
+Requires:	python3-modules >= 1:3.2
+Obsoletes:	python-libsmbios < 2.4.0
+Obsoletes:	yum-plugin-dellsysid < 2.4.0
 
-%description -n python-libsmbios
-Python interface to libsmbios C library.
+%description -n python3-libsmbios
+Python 3 interface to libsmbios C library.
 
-%description -n python-libsmbios -l pl.UTF-8
-Interfejs Pythona do biblioteki C libsmbios.
-
-%package -n yum-plugin-dellsysid
-Summary:	YUM plugin to retrieve the Dell System ID
-Summary(pl.UTF-8):	Wtyczka YUM-a do odczytu identyfikatorów komputerów firmy Dell (Dell System ID)
-Group:		Applications/System
-Requires:	python-libsmbios = %{version}-%{release}
-Requires:	yum
-
-%description -n yum-plugin-dellsysid
-This package contains a YUM plugin which allows the use of certain
-substitutions in yum repository configuration files on Dell systems.
-
-%description -n yum-plugin-dellsysid -l pl.UTF-8
-Ten pakiet zawiera wtyczkę YUM-a, pozwalającą na używanie określonych
-podstawień w plikach konfiguracyjnych repozytoriów yum na komputerach
-firmy Dell.
+%description -n python3-libsmbios -l pl.UTF-8
+Interfejs Pythona 3 do biblioteki C libsmbios.
 
 %prep
 %setup -q
@@ -134,9 +120,8 @@ firmy Dell.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-CPPFLAGS="%{rpmcppflags} -DLIBSMBIOS_ASSERT_CONFIG=1"
-%configure \
-	--enable-libsmbios_cxx
+%configure
+
 %{__make}
 
 %install
@@ -147,13 +132,11 @@ install -d $RPM_BUILD_ROOT%{_includedir}
 	DESTDIR=$RPM_BUILD_ROOT
 
 # not installed by make install
-cp -pr src/include/{smbios,smbios_c} $RPM_BUILD_ROOT%{_includedir}
+cp -pr src/include/smbios_c $RPM_BUILD_ROOT%{_includedir}
 
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsmbios*.la
 
-%py_postclean
-
 %find_lang %{name}
 
 %clean
@@ -164,40 +147,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc COPYING COPYING-OSL NEWS README.md TODO
-%attr(755,root,root) %{_libdir}/libsmbios.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsmbios.so.2
+%doc COPYING COPYING-OSL README.md
 %attr(755,root,root) %{_libdir}/libsmbios_c.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsmbios_c.so.2
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/dellLEDCtl
-%attr(755,root,root) %{_sbindir}/dellMediaDirectCtl
 %attr(755,root,root) %{_sbindir}/smbios-*
 %dir %{_sysconfdir}/libsmbios
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libsmbios/logging.conf
 %{_datadir}/smbios-utils
+%{_mandir}/man1/smbios-*.1*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsmbios.so
 %attr(755,root,root) %{_libdir}/libsmbios_c.so
-%{_includedir}/smbios
 %{_includedir}/smbios_c
-%{_pkgconfigdir}/libsmbios_c++.pc
 %{_pkgconfigdir}/libsmbios_c.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libsmbios.a
 %{_libdir}/libsmbios_c.a
 
-%files -n python-libsmbios
-%defattr(644,root,root,755)
-%{py_sitescriptdir}/libsmbios_c
-
-%files -n yum-plugin-dellsysid
+%files -n python3-libsmbios
 %defattr(644,root,root,755)
-%{_prefix}/lib/yum-plugins/dellsysid.py*
-%config(noreplace) %verify(not md5 mtime size) /etc/yum/pluginconf.d/dellsysid.conf
+%{py3_sitedir}/libsmbios_c
diff --git a/libsmbios-sh.patch b/libsmbios-sh.patch
index 8236cc7..0392726 100644
--- a/libsmbios-sh.patch
+++ b/libsmbios-sh.patch
@@ -7,9 +7,9 @@
 -		perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|"  $@;\
 +		perl -p -i -e "s|^$$var\s*=.*|$$var=\"$$(eval echo \$$$$var)\"|"  $@;\
  	done
---- libsmbios-2.2.26/Makefile-std.orig	2009-06-23 21:08:54.000000000 +0200
-+++ libsmbios-2.2.26/Makefile-std	2010-08-14 16:23:26.766824134 +0200
-@@ -45,7 +45,7 @@ install-data-hook:
+--- libsmbios-2.4.1/Makefile-std.orig	2018-02-14 20:28:09.000000000 +0100
++++ libsmbios-2.4.1/Makefile-std	2018-04-21 21:17:29.186674425 +0200
+@@ -38,7 +38,7 @@ install-data-hook:
  	    file=$(DESTDIR)/$$i                     ;\
  	    for var in $(REPLACE_VARS)	;\
  	    do	\
@@ -18,7 +18,7 @@
  	    done	;\
  	done
  
-@@ -55,7 +55,7 @@ install-exec-hook:
+@@ -48,7 +48,7 @@ install-exec-hook:
  	    file=$(DESTDIR)/$$i                     ;\
  	    for var in $(REPLACE_VARS)	;\
  	    do	\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsmbios.git/commitdiff/19e2795a3bcb1ed8b8dca254376a58a4b160124e

More information about the pld-cvs-commit mailing list