diff --git a/libsmbios-2.2.28-fix-bashisms.patch b/libsmbios-2.2.28-fix-bashisms.patch deleted file mode 100644 index d4fa720..0000000 --- a/libsmbios-2.2.28-fix-bashisms.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Ndur libsmbios-2.2.28/doc/pkgheader.sh libsmbios-2.2.28-fix-bashisms/doc/pkgheader.sh ---- libsmbios-2.2.28/doc/pkgheader.sh 2008-05-13 18:19:39.000000000 +0300 -+++ libsmbios-2.2.28-fix-bashisms/doc/pkgheader.sh 2014-11-20 00:28:20.117811035 +0200 -@@ -49,7 +49,7 @@ - exit 1 - fi - echo -- pushd $tmpdir >/dev/null 2>&1 -+ cd $tmpdir - echo "Running BIOS Update:" - if ! ./$_PRG -u -f ./bios.hdr "$@"; then - echo -@@ -59,7 +59,7 @@ - echo "You must now reboot your system!" - echo - fi -- popd >/dev/null 2>&1 -+ cd - >/dev/null - } - - checkroot() diff --git a/libsmbios-2.3.0.tar.xz b/libsmbios-2.3.0.tar.xz deleted file mode 100644 index 3e5bfe8..0000000 --- a/libsmbios-2.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c71f040df170f6b55a874f292929792449ba1fad6029ba18544ed04a88343c1c -size 830840 diff --git a/libsmbios.changes b/libsmbios.changes index 557b646..7cc447e 100644 --- a/libsmbios.changes +++ b/libsmbios.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Mar 2 14:08:43 UTC 2017 - fschnizlein@suse.com + +- Update to 2.3.2 + * Drop rbu support + * Add smbios-battery script +- Fetch source from GitHub +- Remove obsolete patches: +D libsmbios-2.2.28-fix-bashisms.patch since pkgheader.sh was + removed + ------------------------------------------------------------------- Wed Jul 6 16:31:44 UTC 2016 - trenn@suse.de diff --git a/libsmbios.spec b/libsmbios.spec index 1ea82fe..e4e7211 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -1,7 +1,7 @@ # # spec file for package libsmbios # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,21 +20,24 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: libsmbios -Version: 2.3.0 +Version: 2.3.2 Release: 0 Summary: Libraries to get information from standard BIOS tables License: GPL-2.0+ or OSL-2.1 Group: System/Management -Url: http://linux.dell.com/libsmbios/main/ -Source0: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/%{name}-%{version}.tar.xz -Patch1: %{name}-2.2.28-fix-bashisms.patch +Url: https://github.com/dell/libsmbios +Source0: https://github.com/dell/libsmbios/archive/v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: autogen +BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libcppunit-devel +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python-base BuildRequires: pkgconfig(libxml-2.0) @@ -124,9 +127,9 @@ substitutions in yum repository configuration files on Dell systems. %prep %setup -q -%patch1 -p1 %build +./autogen.sh %configure --disable-rpath make %{?_smp_mflags} @@ -149,7 +152,7 @@ mv out/libsmbios_c++ out/libsmbios_c++-%{_arch} # Manually install the doc files for the devel package in order to fix duplicates with "fdupes -s" install -dp -m 0755 %{buildroot}%{_defaultdocdir}/%{name}-devel -cp -a AUTHORS COPYING-GPL COPYING-OSL ChangeLog NEWS README TODO doc/old_news.txt %{buildroot}%{_defaultdocdir}/%{name}-devel/ +cp -a COPYING COPYING-GPL COPYING-OSL NEWS README TODO %{buildroot}%{_defaultdocdir}/%{name}-devel/ cp -a src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt %{buildroot}%{_defaultdocdir}/%{name}-devel/ cp -a out/libsmbios_c-%{_arch} %{buildroot}%{_defaultdocdir}/%{name}-devel/ cp -a out/libsmbios_c++-%{_arch} %{buildroot}%{_defaultdocdir}/%{name}-devel/ @@ -191,16 +194,14 @@ rm -rf %{buildroot} %files -n python-smbios %defattr(-,root,root,-) -%doc AUTHORS COPYING-GPL COPYING-OSL ChangeLog NEWS README TODO doc/old_news.txt +%doc COPYING-GPL COPYING-OSL NEWS README TODO %{python_sitelib}/libsmbios_c/ %files -n smbios-utils-bin %defattr(-,root,root,-) -%doc AUTHORS COPYING-GPL COPYING-OSL ChangeLog NEWS README TODO doc/old_news.txt -%doc doc/pkgheader.sh +%doc COPYING-GPL COPYING-OSL NEWS README TODO %defattr(555,root,root,-) # legacy C++ -%{_sbindir}/dellBiosUpdate-compat %{_sbindir}/dellLEDCtl %ifnarch ia64 %{_sbindir}/dellMediaDirectCtl @@ -215,14 +216,14 @@ rm -rf %{buildroot} %files -n smbios-utils-python %defattr(-,root,root,-) -%doc AUTHORS COPYING-GPL COPYING-OSL ChangeLog NEWS README TODO doc/old_news.txt +%doc COPYING-GPL COPYING-OSL NEWS README TODO %dir %{_sysconfdir}/libsmbios %config(noreplace) %{_sysconfdir}/libsmbios/* %defattr(555,root,root,-) # python utilities %{_sbindir}/smbios-lcd-brightness %{_sbindir}/smbios-passwd -%{_sbindir}/smbios-rbu-bios-update +%{_sbindir}/smbios-battery-ctl %{_sbindir}/smbios-sys-info %{_sbindir}/smbios-token-ctl %{_sbindir}/smbios-wakeup-ctl @@ -232,7 +233,7 @@ rm -rf %{buildroot} %files -n yum-dellsysid %defattr(-,root,root,-) -%doc AUTHORS COPYING-GPL COPYING-OSL ChangeLog NEWS README TODO doc/old_news.txt +%doc COPYING-GPL COPYING-OSL NEWS README TODO %dir %{_sysconfdir}/yum %dir %{_sysconfdir}/yum/pluginconf.d %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/dellsysid.conf diff --git a/v2.3.2.tar.gz b/v2.3.2.tar.gz new file mode 100644 index 0000000..acc975b --- /dev/null +++ b/v2.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:527874a2abad8f8a9320eeb6b5dd11b6d5b8fff6cdc90bb0f757c39da519714f +size 800862