From 121fda855f958ba3d967398ad3c3403e912e4e69 Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Wed, 13 Feb 2008 15:22:30 +0000 Subject: [PATCH] - ABI incompatible, minor API changes - sync up libsmbios soname with version # - move binaries to /usr/sbin as they are only runnable by root - drop libsmbiosxml lib as it was mostly unused. - drop autotools generated files out of git and add autogen.sh - drop tokenCtl binary-- pysmbios has a *much* improved version --- .cvsignore | 2 +- libsmbios.spec | 92 +++++++++++++++++++------------------------------- sources | 2 +- 3 files changed, 36 insertions(+), 60 deletions(-) diff --git a/.cvsignore b/.cvsignore index b1f21da..c48858f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libsmbios-0.13.13.tar.gz +libsmbios-2.0.0.tar.gz diff --git a/libsmbios.spec b/libsmbios.spec index ef9d252..983d19d 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -1,7 +1,7 @@ # these are all substituted by autoconf -%define major 0 -%define minor 13 -%define sub 13 +%define major 2 +%define minor 0 +%define sub 0 %define extralevel %{nil} %define release_name libsmbios %define release_version %{major}.%{minor}.%{sub}%{extralevel} @@ -13,15 +13,15 @@ License: GPLv2+ or OSL Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz URL: http://linux.dell.com/libsmbios/main -Summary: Open BIOS parsing libs +Summary: Libsmbios shared libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Provides: libsmbios-libs = %{version}-%{release} +BuildRequires: libxml2-devel # libsmbios only ever makes sense on intel compatible arches # no DMI tables on ppc, s390, etc. ExclusiveArch: x86_64 ia64 %{ix86} -BuildRequires: libxml2-devel - #EPEL4/5 dont have cppunit/cppunit-devel, so skip build tests # everything else should be able to pull in cppunit to run unit tests # during build. Doesnt affect binaries produced, so doesnt affect @@ -35,39 +35,24 @@ BuildRequires: cppunit-devel BuildRequires: doxygen %endif + %description 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. -%package libs -Summary: Libsmbios shared libraries -Group: System Environment/Libraries -Obsoletes: libsmbiosxml-libs < 0:%{version}-%{release} -Obsoletes: libsmbios < 0:%{version}-%{release} -Provides: libsmbiosxml-libs = %{version}-%{release} - - -%package bin +%package -n smbios-utils Summary: The "supported" sample binaries that use libsmbios Group: Applications/System -Requires: libsmbios-libs = %{version}-%{release} -Obsoletes: libsmbiosxml-bin < 0:%{version}-%{release} -Provides: libsmbiosxml-bin = %{version}-%{release} -Obsoletes: smbios-utils < 0:%{version}-%{release} - -%package unsupported-bin -Summary: Unsupported sample binaries using libsmbios -Group: Applications/System -Requires: libsmbios-libs = %{version}-%{release} +Requires: libsmbios = %{version}-%{release} +Obsoletes: libsmbios-bin < 0:0.13.11 +Provides: libsmbios-bin = %{version}-%{release} +Obsoletes: libsmbios-unsupported-bin < 0.13.11 +Provides: libsmbios-unsupported-bin = %{version}-%{release} %package devel Summary: Development headers and archives Group: Development/Libraries -Requires: libsmbios-libs = %{version}-%{release} - -%description libs -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. +Requires: libsmbios = %{version}-%{release} %description devel Libsmbios is a library and utilities that can be used by client programs @@ -76,13 +61,7 @@ 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. -%description bin -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. - -%description unsupported-bin +%description -n smbios-utils 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. @@ -107,7 +86,7 @@ make -e %{?_smp_mflags} [ ! -d /usr/include/cppunit ] || make -e check %install -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" mkdir -p %{buildroot}/usr/include @@ -119,18 +98,16 @@ find doc/full -exec touch -r configure.ac {} \; # backwards compatible: ln -s /usr/sbin/dellWirelessCtl %{buildroot}/usr/bin/dellWirelessCtl - %clean rm -rf %{buildroot} -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig -%files libs +%files %defattr(-,root,root,-) %doc COPYING-GPL COPYING-OSL README %{_libdir}/libsmbios.so.* -%{_libdir}/libsmbiosxml.so.* %files devel %defattr(-,root,root,-) @@ -138,27 +115,27 @@ rm -rf %{buildroot} /usr/include/smbios %{_libdir}/libsmbios.a %{_libdir}/libsmbios.so -%{_libdir}/libsmbiosxml.a -%{_libdir}/libsmbiosxml.so +%doc doc/full/html -%files bin +%files -n smbios-utils %defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL README bin-unsupported/getopts_LICENSE.txt +%doc COPYING-GPL COPYING-OSL README +%doc bin-unsupported/getopts_LICENSE.txt include/smbios/config/boost_LICENSE_1_0_txt %{_sbindir}/assetTag %{_sbindir}/dellBiosUpdate %{_sbindir}/getSystemId %{_sbindir}/propertyTag %{_sbindir}/serviceTag -%{_sbindir}/tokenCtl %{_sbindir}/verifySmiPassword %{_sbindir}/wakeupCtl %{_sbindir}/dellLcdBrightness + +# used by HAL in old location, so keep it around until HAL is updated. %{_sbindir}/dellWirelessCtl %{_bindir}/dellWirelessCtl -%files unsupported-bin -%defattr(-,root,root,-) -%doc COPYING-GPL COPYING-OSL README include/smbios/config/boost_LICENSE_1_0_txt bin-unsupported/getopts_LICENSE.txt +# community supported stuff... +# may or may not work %{_sbindir}/dellLEDCtl %{_sbindir}/activateCmosToken %{_sbindir}/ascii2enUS_scancode @@ -175,14 +152,13 @@ rm -rf %{buildroot} # ./ChangeLog is appended by configure %changelog -* Mon Nov 26 2007 Michael Brown - 0.13.13-1 -- Fix for compiling with recent gcc (from Danny Kukawa @ suse) -- fix for lsb issues - moved binaries to /usr/sbin/ because they require admin - privs to run. Made one backwards-compat symlink to work with existing HAL - which expects current location. - -* Mon Aug 28 2007 Michael E Brown - 0.13.10-1 -- Fix one instance where return code to fread was incorrectly checked. +* Wed Jan 9 2008 Michael E Brown - 2.0.0 +- ABI incompatible, minor API changes +- sync up libsmbios soname with version # +- move binaries to /usr/sbin as they are only runnable by root +- drop libsmbiosxml lib as it was mostly unused. +- drop autotools generated files out of git and add autogen.sh +- drop tokenCtl binary-- pysmbios has a *much* improved version * Wed Aug 22 2007 Michael E Brown - 0.13.9 - Fix a couple of failure-to-check-return on fopen. most were unit-test code diff --git a/sources b/sources index 2ae51b5..27c6be1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38ac169cfe866a8472e76df5c184a8ca libsmbios-0.13.13.tar.gz +c66e2c6549010ac777dd51ea65e91faa libsmbios-2.0.0.tar.gz