SHA256
1
0
forked from pool/libsmbios

Accepting request 64549 from Base:System

Accepted submit request 64549 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/64549
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsmbios?expand=0&rev=23
This commit is contained in:
Sascha Peilicke 2011-03-21 09:18:21 +00:00 committed by Git OBS Bridge
parent 2865568f58
commit 905926e0a5
6 changed files with 237 additions and 269 deletions

View File

@ -1,51 +0,0 @@
Index: libraries/cmos/CmosRW.cpp
===================================================================
--- libraries/cmos/CmosRW.cpp.orig 2008-02-13 20:12:43.000000000 +0100
+++ libraries/cmos/CmosRW.cpp 2009-03-02 17:10:07.000000000 +0100
@@ -19,6 +19,7 @@
// compat header should always be first header if including system headers
#define LIBSMBIOS_SOURCE
#include "smbios/compat.h"
+#include <stdio.h>
#include <errno.h>
#include <string.h>
#include "CmosRWImpl.h"
Index: libraries/memory/Memory_Linux.cpp
===================================================================
--- libraries/memory/Memory_Linux.cpp.orig 2007-10-20 00:15:12.000000000 +0200
+++ libraries/memory/Memory_Linux.cpp 2009-03-02 17:09:33.000000000 +0100
@@ -19,7 +19,7 @@
// compat header should always be first header if including system headers
#define LIBSMBIOS_SOURCE
#include "smbios/compat.h"
-
+#include <stdio.h>
#include <errno.h>
#include <sys/mman.h> /* mmap */
#include <unistd.h> /* getpagesize */
Index: libraries/smbios/SmbiosStrategy_Linux.cpp
===================================================================
--- libraries/smbios/SmbiosStrategy_Linux.cpp.orig 2007-10-20 00:15:12.000000000 +0200
+++ libraries/smbios/SmbiosStrategy_Linux.cpp 2009-03-02 17:12:32.000000000 +0100
@@ -19,7 +19,7 @@
// compat header should always be first header if including system headers
#define LIBSMBIOS_SOURCE
#include "smbios/compat.h"
-
+#include <stdio.h>
#include <sstream>
#include <string.h>
Index: libraries/smi/SmiImpl.h
===================================================================
--- libraries/smi/SmiImpl.h.orig 2007-11-27 18:50:54.000000000 +0100
+++ libraries/smi/SmiImpl.h 2009-03-02 17:13:45.000000000 +0100
@@ -17,7 +17,7 @@
#ifndef SMIIMPL_H
#define SMIIMPL_H
-
+#include <stdio.h>
#include "smbios/ISmi.h"
#include "SmiLowLevel.h"
#include "ExceptionImpl.h"

View File

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

3
libsmbios-2.2.26.tar.bz2 Normal file
View File

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

View File

@ -1,11 +0,0 @@
--- bin-supported/getopts.c 2008-01-08 18:57:17.000000000 +0100
+++ bin-supported/getopts.c 2008-01-08 18:57:46.000000000 +0100
@@ -55,7 +55,7 @@
printf(" --help,\t-h\t\t\tDisplays this information\n");
for (count = 0; opts[count].description; count++)
{
- char *cmd = 0;
+ char *cmd = NULL;
if (opts[count].name && opts[count].shortName)
{
cmd = calloc(1, strlen(opts[count].name) + strlen(opts[count].shortName) + 15);

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Mar 18 20:55:11 UTC 2011 - asterios.dramis@gmail.com
- Update to version 2.2.26:
* Lots of changes (see ChangeLog).
- Spec file updates:
* Major changes in subpackages (based on the package spec file and Fedora
package):
+ Replaced libsmbios-bin and libsmbios-unsupported-bin with
smbios-utils-bin and smbios-utils-python (added smbios-utils meta-package
to Obsolete+Provide them).
+ Added python-smbios and yum-dellsysid subpackages.
+ Removed static subpackage.
* Changes based on rpmdevtools templates and spec-cleaner run.
* Changed License: to GPLv2+ or OSL 2.1.
* Updates in Summary:, Url:, Group: and %description sections.
* Updates in Buildrequires:, Requires:, Obsoletes: and Provides: sections.
* Updates in %prep, %build and %install sections.
* Removed %define entries, other conditions, etc.
* Removed support for suse_version < 1100.
* Various other changes based on the package spec file.
- Fixed rpmlint warning about "files-duplicate".
- Removed the two patches (fixed upstream).
-------------------------------------------------------------------
Wed Oct 28 17:28:59 UTC 2009 - crrodriguez@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package libsmbios (Version 2.0.2)
# spec file for package libsmbios
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 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
@ -15,253 +15,259 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: libsmbios
BuildRequires: Xerces-c-devel cppunit-devel gcc-c++ libxml2-devel tree
Url: http://linux.dell.com/libsmbios/main/index.html
%define _unpackaged_files_terminate_build 0
%define build_static 0
# automatically determine if we should build docs
%define build_docs %( ( which doxygen > /dev/null 2>&1 && echo 1) || echo 0 )
%define run_cppunit %( ([ -e /usr/include/cppunit ] && echo 1) || echo 0)
%{?_without_docs: %{expand: %%define build_docs 0}}
%{?_with_docs: %{expand: %%define build_docs 1}}
%{?_without_cppunit: %{expand: %%define run_cppunit 0}}
%{?_with_cppunit: %{expand: %%define run_cppunit 1}}
%define major 2
%define minor 0
%define sub 2
%define extralevel %{nil}
%define release_name libsmbios
%define release_version %{major}.%{minor}.%{sub}%{extralevel}
%define LIBNAME libsmbios2
Version: %{major}.%{minor}.%{sub}
Release: 2
License: BSD 3-clause (or similar) ; GPL v2 or later ; Other uncritical OpenSource License
Source: %{name}-%{version}.tar.bz2
Patch0: libsmbios-fix-compiler_warning_cgcc.diff
Patch1: libsmbios-2.0.2-gcc44.patch
Summary: Open BIOS parsing libs
Version: 2.2.26
Release: 1
Summary: Libraries to get information from standard BIOS tables
License: GPLv2+ or OSL 2.1
Url: http://linux.dell.com/libsmbios/main/
Group: System/Management
Source0: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libcppunit-devel
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
BuildRequires: python-base
# Modules: dcdbas.ko
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
# Generated with: extract-modaliases dcdbas
# libsmbios only ever makes sense on intel compatible arches, no DMI tables on ppc, s390, etc.
ExclusiveArch: ia64 %{ix86} x86_64
%description
Libsmbios is a library and utilites that can be used by client programs
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.
Authors:
--------
Michael Brown
%if 0%{?suse_version} < 1100
%package libs
License: GPL v2 or later
%else
%package -n libsmbios2
License: BSD 3-clause (or similar) ; GPL v2 or later ; Other uncritical OpenSource License
%endif
Summary: Libsmbios shared libraries
Group: System/Management
Provides: %name = %version
Obsoletes: libsmbios-libs <= 0.13.12
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
%package bin
License: GPL v2 or later
Summary: The "supported" sample binaries that use libsmbios
Group: System/Management
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
%package unsupported-bin
License: GPL v2 or later
Summary: Unsupported sample binaries using libsmbios
Group: System/Management
%package devel
License: GPL v2 or later
Summary: development headers and archives
Group: System/Management
Summary: Development headers and archives
License: GPLv2+ or OSL 2.1
Group: Development/Libraries/C and C++
Requires: libsmbios2 = %{version}
Requires: libstdc++-devel
%package static
License: GPL v2 or later ; Other uncritical OpenSource License
Summary: Open BIOS parsing libs
Group: System/Management
%if 0%{?suse_version} < 1100
%description libs
Libsmbios is a library and utilites that can be used by client programs
to get information from standard BIOS tables, such as the SMBIOS table.
Authors:
--------
Michael Brown
%else
%description -n %LIBNAME
%endif
Libsmbios is a library and utilites that can be used by client programs
to get information from standard BIOS tables, such as the SMBIOS table.
Authors:
--------
Michael Brown
%description devel
Libsmbios is a library and utilites that can be used by client programs
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 contains the headers and .a files necessary to compile new client
programs against libsmbios.
%package -n libsmbios2
Summary: Libraries to get information from standard BIOS tables
License: GPLv2+ or OSL 2.1
Group: System/Management
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
Obsoletes: libsmbios-libs <= 0.13.12
Provides: libsmbios-libs = %{version}
%description -n libsmbios2
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 contains the headers and .a files necessary to compile new
client programs against libsmbios
%package -n python-smbios
Summary: Python interface to Libsmbios C library
License: GPLv2+ or OSL 2.1
Group: Development/Libraries/Python
Requires: libsmbios2 = %{version}
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
%if %{?suse_version: 0%{?suse_version} > 1110} %{!?suse_version:1}
BuildArch: noarch
%endif
%description -n python-smbios
This package provides a Python interface to libsmbios.
%package -n smbios-utils
Summary: Meta-package that pulls in all smbios binaries and python scripts
License: GPLv2+ or OSL 2.1
Group: System/Management
Requires: smbios-utils-bin
Requires: smbios-utils-python
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
Obsoletes: libsmbios-bin <= 2.0.2
Provides: libsmbios-bin = %{version}
Obsoletes: libsmbios-unsupported-bin <= 2.0.2
Provides: libsmbios-unsupported-bin = %{version}
Authors:
--------
Michael Brown
%description -n smbios-utils
This is a meta-package that pulls in the binary libsmbios executables as well
as the python executables.
%description bin
Libsmbios is a library and utilites that can be used by client programs
to get information from standard BIOS tables, such as the SMBIOS table.
%package -n smbios-utils-bin
Summary: Binary utilities that use libsmbios
License: GPLv2+ or OSL 2.1
Group: System/Management
Requires: libsmbios2 = %{version}
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
This package contains some sample binaries that use libsmbios.
%description -n smbios-utils-bin
Get BIOS information, such as System product name, product id, service tag and
asset tag.
%package -n smbios-utils-python
Summary: Python executables that use libsmbios
License: GPLv2+ or OSL 2.1
Group: System/Management
Requires: python-smbios = %{version}
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
%description -n smbios-utils-python
Get BIOS information, such as System product name, product id, service tag and
asset tag. Set service and asset tags on Dell machines. Manipulate wireless
cards/bluetooth on Dell laptops. Set BIOS password on select Dell systems.
Update BIOS on select Dell systems. Set LCD brightness on select Dell laptops.
Authors:
--------
Michael Brown
%package -n yum-dellsysid
Summary: YUM plugin to retrieve the Dell System ID
License: GPLv2+ or OSL 2.1
Group: System/Packages
# yum plugin and supporting functions first appeared in 2.2.0
Requires: smbios-utils-python >= 2.2.0
Requires: yum
%description unsupported-bin
Libsmbios is a library and utilites that can be used by client programs
to get information from standard BIOS tables, such as the SMBIOS table.
%description -n yum-dellsysid
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 contains some sample binaries that use libsmbios.
Authors:
--------
Michael Brown
%description static
Libsmbios is a library and utilites that can be used by client programs
to get information from standard BIOS tables, such as the SMBIOS table.
Authors:
--------
Michael Brown
This package contains a YUM plugin which allows the use of certain
substitutions in yum repository configuration files on Dell systems.
%prep
%setup -q
%patch0
%patch1
find . -type d -exec chmod -f 755 {} \;
find doc include libraries bin-supported bin-unsupported build cppunit -type f -exec chmod -f 644 {} \;
%setup -q
%build
%configure --disable-static --with-pic
make %{?_smp_mflags} EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel}
%if %{build_docs}
make -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} doxygen
%endif
%if %{run_cppunit}
make -e EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} unit_test
%endif
%configure --disable-rpath
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}/usr/include
cp -a include/smbios %{buildroot}/usr/include/
rm -vf %{buildroot}/%{_libdir}/lib*.la
rm -fv %{buildroot}/%{_libdir}/lib*.a
%makeinstall
# Install headers
install -dp -m 0755 %{buildroot}%{_includedir}
cp -a src/include/* %{buildroot}/%{_includedir}/
cp -a out/public-include/* %{buildroot}/%{_includedir}/
#
find %{buildroot}/%{_includedir} out/libsmbios_c++ out/libsmbios_c -exec touch -r configure.ac {} \;
# Remove *.la files (package provides pkg-config files), remove static libraries
rm -f %{buildroot}/%{_libdir}/lib*.{la,a}
# Prepare doc files for devel package
mv out/libsmbios_c out/libsmbios_c-%{_arch}
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 out/libsmbios_c-%{_arch} %{buildroot}%{_defaultdocdir}/%{name}-devel/
cp -a out/libsmbios_c++-%{_arch} %{buildroot}%{_defaultdocdir}/%{name}-devel/
#
rename libsmbios.mo libsmbios-2.2-x86_64.mo $(find %{buildroot}/%{_datadir} -name libsmbios.mo)
# Remove unneeded locales
%if 0%{?suse_version} < 1140
rm -rf %{buildroot}%{_datadir}/locale/en/
rm -rf %{buildroot}%{_datadir}/locale/en@boldquot/
rm -rf %{buildroot}%{_datadir}/locale/en@quot/
%endif
%find_lang %{name}-2.2-x86_64
# Backwards compatible symlinks
ln -s %{_sbindir}/dellWirelessCtl %{buildroot}%{_bindir}/dellWirelessCtl
ln -s smbios-lcd-brightness %{buildroot}%{_sbindir}/dellLcdBrightness
ln -s smbios-rbu-bios-update %{buildroot}%{_sbindir}/dellBiosUpdate
ln -s smbios-sys-info %{buildroot}%{_sbindir}/getSystemId
ln -s smbios-wireless-ctl %{buildroot}%{_sbindir}/dellWirelessCtl
%fdupes -s %{buildroot}
%clean
rm -rf ${RPM_BUILD_ROOT}
%if 0%{?suse_version} < 1100
rm -rf %{buildroot}
%post libs -p /sbin/ldconfig
%else
%post -n libsmbios2 -p /sbin/ldconfig
%post -n %LIBNAME -p /sbin/ldconfig
%endif
%if 0%{?suse_version} < 1100
%postun libs -p /sbin/ldconfig
%else
%postun -n %LIBNAME -p /sbin/ldconfig
%endif
%if 0%{?suse_version} < 1100
%files libs
%else
%files -n %LIBNAME
%endif
%defattr(-,root,root)
%{_libdir}/libsmbios.so.*
%postun -n libsmbios2 -p /sbin/ldconfig
%files devel
%defattr(-,root,root)
%doc COPYING-GPL COPYING-OSL README bin-unsupported/getopts_LICENSE.txt
%if %{build_docs}
%doc doc/full/html
%endif
/usr/include/smbios
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/%{name}-devel/
%{_includedir}/smbios/
%{_includedir}/smbios_c/
%{_libdir}/libsmbios.so
%{_libdir}/libsmbios_c.so
%{_libdir}/pkgconfig/libsmbios_c*.pc
%files bin
%defattr(644,root,root,755)
%files -n libsmbios2 -f %{name}-2.2-x86_64.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING-GPL COPYING-OSL ChangeLog NEWS README TODO doc/old_news.txt
%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
%{_libdir}/libsmbios.so.*
%{_libdir}/libsmbios_c.so.*
%files -n python-smbios
%defattr(-,root,root,-)
%{python_sitelib}/libsmbios_c/
%files -n smbios-utils
%defattr(-,root,root,-)
%doc COPYING-GPL COPYING-OSL README
%defattr(555,root,root)
%{_sbindir}/assetTag
%files -n smbios-utils-bin
%defattr(-,root,root,-)
%doc doc/pkgheader.sh
%defattr(555,root,root,-)
# legacy C++
%{_sbindir}/dellBiosUpdate-compat
%{_sbindir}/dellLEDCtl
%ifnarch ia64
%{_sbindir}/dellMediaDirectCtl
%endif
# new C utilities
%{_sbindir}/smbios-get-ut-data
%{_sbindir}/smbios-state-byte-ctl
%{_sbindir}/smbios-sys-info-lite
%{_sbindir}/smbios-upflag-ctl
%files -n smbios-utils-python
%defattr(-,root,root,-)
%dir %{_sysconfdir}/libsmbios
%config(noreplace) %{_sysconfdir}/libsmbios/*
%defattr(555,root,root,-)
# used by HAL in old location, so keep it around until HAL is updated
%{_bindir}/dellWirelessCtl
# python utilities
%{_sbindir}/smbios-lcd-brightness
%{_sbindir}/smbios-passwd
%{_sbindir}/smbios-rbu-bios-update
%{_sbindir}/smbios-sys-info
%{_sbindir}/smbios-token-ctl
%{_sbindir}/smbios-wakeup-ctl
%{_sbindir}/smbios-wireless-ctl
# backwards compatible symlinks
%{_sbindir}/dellBiosUpdate
%{_sbindir}/getSystemId
%{_sbindir}/propertyTag
%{_sbindir}/serviceTag
%{_sbindir}/verifySmiPassword
%{_sbindir}/wakeupCtl
%{_sbindir}/dellLcdBrightness
%{_sbindir}/dellWirelessCtl
%{_sbindir}/mkbiospkg.sh
%{_sbindir}/getSystemId
%defattr(-,root,root,-)
# data files
%{_datadir}/smbios-utils/
%files unsupported-bin
%defattr(644,root,root,755)
%doc COPYING-GPL COPYING-OSL README include/smbios/config/boost_LICENSE_1_0_txt bin-unsupported/getopts_LICENSE.txt
%defattr(555,root,root)
%{_sbindir}/activateCmosToken
%{_sbindir}/ascii2enUS_scancode
%{_sbindir}/createUnitTestFiles
%{_sbindir}/disable_console_redir
%{_sbindir}/dumpCmos
%{_sbindir}/dellLEDCtl
%{_sbindir}/getPasswordFormat
%{_sbindir}/isCmosTokenActive
%{_sbindir}/probes
%{_sbindir}/smitest
%{_sbindir}/stateByteCtl
%{_sbindir}/upBootCtl
%{_sbindir}/dumpSmbios
%if %{build_static}
%files static
%defattr(555,root,root)
%{_bindir}/*S
%endif
%files -n yum-dellsysid
%defattr(-,root,root,-)
# YUM Plugin
%dir %{_sysconfdir}/yum
%dir %{_sysconfdir}/yum/pluginconf.d
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/dellsysid.conf
%dir %{_exec_prefix}/lib/yum-plugins
%{_exec_prefix}/lib/yum-plugins/dellsysid.*
%changelog