OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsmbios?expand=0&rev=6

2007-11-05 11:27:26 +00:00 · 2007-11-05 11:27:26 +00:00 · d813288ea1
commit d813288ea1
parent 375a85e880
5 changed files with 44 additions and 328 deletions
--- a/libsmbios-0.13.10.tar.bz2
+++ b/libsmbios-0.13.10.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eecbad56e94905f52b09fb869972e2a06d99e73d8b73290b58ee5e477fe5fe21
-size 3299227
--- a/libsmbios-0.13.12.tar.bz2
+++ b/libsmbios-0.13.12.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2f925bba415d11135d2c55676bee0db9e67636dbaefc98b176a979445f51133
+size 3430038
--- a/libsmbios-fix-includes.diff
+++ b/libsmbios-fix-includes.diff
@ -1,297 +0,0 @@
--- libsmbios-0.13.10/libraries/smbios/SmbiosStrategy.cpp	2007-08-21 08:16:20.000000000 +0200
-+++ libsmbios-0.13.10/libraries/smbios/SmbiosStrategy.cpp	2007-10-12 14:21:03.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "smbios/compat.h"
- 
- #include <sstream>
-+#include <string.h>
- 
- #include "smbios/IMemory.h"
- #include "SmbiosImpl.h"
--- libsmbios-0.13.10/libraries/smbios/SmbiosTable.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/smbios/SmbiosTable.cpp	2007-10-12 14:20:35.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "smbios/compat.h"
- 
- #include <sstream>
-+#include <string.h>
- 
- #include "SmbiosImpl.h"
- 
--- libsmbios-0.13.10/libraries/memory/Memory_Linux.cpp	2007-08-21 08:16:20.000000000 +0200
-+++ libsmbios-0.13.10/libraries/memory/Memory_Linux.cpp	2007-10-12 14:22:52.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <errno.h>
- #include <sys/mman.h>   /* mmap */
- #include <unistd.h>     /* getpagesize */
-+#include <string.h>     /* memcpy etc. */
- 
- #include "MemoryImpl.h"
- 
--- libsmbios-0.13.10/libraries/smbios/SmbiosWorkaround.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/smbios/SmbiosWorkaround.cpp	2007-10-12 14:24:48.000000000 +0200
-@@ -26,6 +26,8 @@
- // message.h should be included last.
- #include "smbios/message.h"
- 
-+#include <string.h>
-+
- using namespace std;
- 
- // convenience function.
--- libsmbios-0.13.10/libraries/smbios/SmbiosStrategy_Linux.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/smbios/SmbiosStrategy_Linux.cpp	2007-10-12 14:25:44.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "smbios/compat.h"
- 
- #include <sstream>
-+#include <string.h>
- 
- #include "smbios/IMemory.h"
- #include "SmbiosImpl.h"
--- libsmbios-0.13.10/libraries/smbios/SmbiosItem.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/smbios/SmbiosItem.cpp	2007-10-12 14:26:27.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "smbios/compat.h"
- 
- #include <iomanip>
-+#include <string.h>
- 
- #include "SmbiosImpl.h"
- // message.h should be included last.
--- libsmbios-0.13.10/libraries/smi/Smi.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/smi/Smi.cpp	2007-10-12 14:27:07.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "smbios/compat.h"
- 
- //#include <iostream>
-+#include <string.h>
- 
- #include "SmiImpl.h"
- #include "smbios/ISmbios.h"
--- libsmbios-0.13.10/libraries/memory/Memory.cpp	2007-08-21 08:16:20.000000000 +0200
-+++ libsmbios-0.13.10/libraries/memory/Memory.cpp	2007-10-12 14:36:43.000000000 +0200
-@@ -22,6 +22,7 @@
- 
- #include <errno.h>
- #include <stdio.h>
-+#include <string.h>
- 
- #include "MemoryImpl.h"
- 
--- libsmbios-0.13.10/libraries/smi/Smi_Linux.cpp	2007-08-23 04:44:40.000000000 +0200
-+++ libsmbios-0.13.10/libraries/smi/Smi_Linux.cpp	2007-10-12 15:16:02.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "smbios/compat.h"
- 
- #include <sys/file.h>
-+#include <string.h>
- 
- #include "SmiImpl.h"
- 
--- libsmbios-0.13.10/libraries/systeminfo/IdByte.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/systeminfo/IdByte.cpp	2007-10-12 15:55:06.000000000 +0200
-@@ -28,6 +28,8 @@
- #include "SystemDetect.h"
- #include "DellMagic.h"
- 
-+#include <string.h>
-+
- // should always be included last.
- #include "smbios/message.h"
- 
--- libsmbios-0.13.10/libraries/systeminfo/System.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/systeminfo/System.cpp	2007-10-12 16:15:15.000000000 +0200
-@@ -31,6 +31,8 @@
- 
- #include "smbios/version.h"
- 
-+#include <string.h>
-+
- // this always should be included last
- #include "smbios/message.h"
- 
--- libsmbios-0.13.10/libraries/systeminfo/SystemDetect.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/systeminfo/SystemDetect.cpp	2007-10-12 16:16:32.000000000 +0200
-@@ -30,6 +30,8 @@
- // all our magic numbers
- #include "DellMagic.h"
- 
-+#include <string.h>
-+
- // include this last.
- #include "smbios/message.h"
- 
--- libsmbios-0.13.10/libraries/token/TokenDA.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/token/TokenDA.cpp	2007-10-12 16:27:56.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "smbios/compat.h"
- 
- #include <iomanip>
-+#include <string.h>
- 
- #include "TokenImpl.h"
- 
--- libsmbios-0.13.10/libraries/token/TokenD6.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/token/TokenD6.cpp	2007-10-12 16:28:41.000000000 +0200
-@@ -22,6 +22,7 @@
- 
- #include <sstream>
- #include <iomanip>
-+#include <string.h>
- 
- #include "TokenImpl.h"
- 
--- libsmbios-0.13.10/libraries/token/TokenD5.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/token/TokenD5.cpp	2007-10-12 16:29:31.000000000 +0200
-@@ -22,6 +22,7 @@
- 
- #include <sstream>
- #include <iomanip>
-+#include <string.h>
- 
- #include "TokenImpl.h"
- 
--- libsmbios-0.13.10/libraries/token/TokenD4.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/token/TokenD4.cpp	2007-10-12 16:30:10.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "smbios/compat.h"
- 
- #include <iomanip>
-+#include <string.h>
- 
- #include "TokenImpl.h"
- 
--- libsmbios-0.13.10/libraries/xml_libxml2/SmbiosXml.cpp	2007-05-24 17:46:25.000000000 +0200
-+++ libsmbios-0.13.10/libraries/xml_libxml2/SmbiosXml.cpp	2007-10-12 16:44:59.000000000 +0200
-@@ -22,6 +22,7 @@
- 
- #include <sstream>
- #include <iomanip>
-+#include <string.h>
- 
- #include "SmbiosXmlImpl.h"
- #include "StdSmbiosXml.h"
--- libsmbios-0.13.10/bin-supported/assetTag.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-supported/assetTag.cpp	2007-10-12 16:46:11.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <iostream>
- #include <iomanip>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "smbios/IMemory.h"  // only needed if you want to use fake input (memdump.dat)
- #include "smbios/ICmosRW.h"  // only needed if you want to use fake input (cmos.dat)
--- libsmbios-0.13.10/bin-supported/propertyTag.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-supported/propertyTag.cpp	2007-10-12 17:51:17.000000000 +0200
-@@ -22,7 +22,9 @@
- #include <string>
- #include <iostream>
- #include <iomanip>
-+
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "smbios/ISmi.h"  // only needed if you want to use fake input (memdump.dat)
- #include "smbios/SystemInfo.h" // this is the main header to include to use the C interface
--- libsmbios-0.13.10/bin-supported/serviceTag.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-supported/serviceTag.cpp	2007-10-12 17:52:30.000000000 +0200
-@@ -22,7 +22,9 @@
- #include <string>
- #include <iostream>
- #include <iomanip>
-+
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "smbios/IMemory.h"  // only needed if you want to use fake input (memdump.dat)
- #include "smbios/ICmosRW.h"  // only needed if you want to use fake input (cmos.dat)
--- libsmbios-0.13.10/bin-supported/verifySmiPassword.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-supported/verifySmiPassword.cpp	2007-10-12 19:22:43.000000000 +0200
-@@ -20,6 +20,7 @@
- #include "smbios/compat.h"
- 
- #include <iostream>
-+#include <string.h>
- 
- #include "smbios/ISmi.h"
- #include "smbios/SystemInfo.h"
--- libsmbios-0.13.10/bin-supported/dellLcdBrightness.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-supported/dellLcdBrightness.cpp	2007-10-12 20:20:26.000000000 +0200
-@@ -22,7 +22,9 @@
- #include <string>
- #include <iostream>
- #include <iomanip>
-+
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "smbios/ISmi.h"
- #include "smbios/IToken.h"
--- libsmbios-0.13.10/bin-supported/tokenCtl.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-supported/tokenCtl.cpp	2007-10-12 20:21:33.000000000 +0200
-@@ -35,7 +35,9 @@
- #include <string>
- #include <iostream>
- #include <iomanip>
-+
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "smbios/IToken.h"
- #include "smbios/IMemory.h"
--- libsmbios-0.13.10/bin-supported/dellBiosUpdate.cpp	2007-07-21 01:36:29.000000000 +0200
-+++ libsmbios-0.13.10/bin-supported/dellBiosUpdate.cpp	2007-10-12 20:22:32.000000000 +0200
-@@ -20,6 +20,7 @@
- #include "smbios/compat.h"
- 
- #include <iostream>
-+#include <string.h> 
- 
- #include "smbios/DellRbu.h"
- #include "smbios/SystemInfo.h"
--- libsmbios-0.13.10/bin-supported/dellWirelessCtl.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-supported/dellWirelessCtl.cpp	2007-10-12 20:45:55.000000000 +0200
-@@ -22,7 +22,9 @@
- #include <string>
- #include <iostream>
- #include <iomanip>
-+
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "smbios/ISmi.h"
- #include "smbios/IToken.h"
--- libsmbios-0.13.10/bin-unsupported/ascii2enUS_scancode.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-unsupported/ascii2enUS_scancode.cpp	2007-10-12 22:12:51.000000000 +0200
-@@ -21,6 +21,8 @@
- 
- #include <iostream>
- 
-+#include <string.h>
-+
- #include "smbios/ISmi.h"
- #include "smbios/version.h"
- #include "getopts.h"
--- libsmbios-0.13.10/bin-unsupported/dellLEDCtl.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-unsupported/dellLEDCtl.cpp	2007-10-12 22:14:47.000000000 +0200
-@@ -30,6 +30,7 @@
-     #include <sys/time.h>
- #endif
- #include <time.h>
-+#include <string.h>
- 
- #include "smbios/ISmi.h"
- #include "smbios/IToken.h"
--- libsmbios-0.13.10/bin-unsupported/smitest.cpp	2007-05-24 17:46:23.000000000 +0200
-+++ libsmbios-0.13.10/bin-unsupported/smitest.cpp	2007-10-12 22:55:38.000000000 +0200
-@@ -22,7 +22,9 @@
- #include <string>
- #include <iostream>
- #include <iomanip>
-+
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "smbios/ISmi.h"  // only needed if you want to use fake input (memdump.dat)
- #include "getopts.h"
--- a/libsmbios.changes
+++ b/libsmbios.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Nov  4 15:34:03 CET 2007 - dkukawka@suse.de
+
+- updated to new version 0.13.12:
+- removed upstream gone patch:
+  - libsmbios-fix-includes.diff
+- fixed spec-file: 
+  - binaries moved from /usr/bin to /usr/sbin
+
 -------------------------------------------------------------------
 Tue Oct 16 14:08:56 CEST 2007 - dkukawka@suse.de

--- a/libsmbios.spec
+++ b/libsmbios.spec
@ -1,5 +1,5 @@
 #
-# spec file for package libsmbios (Version 0.13.10)
+# spec file for package libsmbios (Version 0)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@ -25,15 +25,14 @@ Url:            http://linux.dell.com/libsmbios/main/index.html
 %{?_with_cppunit: %{expand: %%define run_cppunit 1}}
 %define major 0
 %define minor 13
-%define sub 6
+%define sub 12
 %define extralevel %{nil}
 %define release_name libsmbios
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
-Version:        0.13.10
+Version:        %{major}.%{minor}.%{sub}
 Release:        1
 License:        BSD 3-Clause; GPL v2 or later; Other uncritical OpenSource License
 Source:         %{name}-%{version}.tar.bz2
-Patch0:         libsmbios-fix-includes.diff
 Summary:        Open BIOS parsing libs
 Group:          System/Management
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@ -159,7 +158,6 @@ Authors:

 %prep
 %setup 
-%patch0 -p1
 find . -type d -exec chmod -f 755 {} \;
 find doc include libraries bin-supported bin-unsupported build cppunit -type f -exec chmod -f 644 {} \;

@ -215,37 +213,37 @@ ldconfig
 %files bin 
 %defattr(555,root,root)
 %doc COPYING-GPL COPYING-OSL README
-%{_bindir}/assetTag
-%{_bindir}/dellBiosUpdate
-%{_bindir}/getSystemId
-%{_bindir}/propertyTag
-%{_bindir}/serviceTag
-%{_bindir}/tokenCtl
-%{_bindir}/verifySmiPassword
-%{_bindir}/wakeupCtl
-%{_bindir}/dellLcdBrightness
-%{_bindir}/dellWirelessCtl
+%{_sbindir}/assetTag
+%{_sbindir}/dellBiosUpdate
+%{_sbindir}/getSystemId
+%{_sbindir}/propertyTag
+%{_sbindir}/serviceTag
+%{_sbindir}/tokenCtl
+%{_sbindir}/verifySmiPassword
+%{_sbindir}/wakeupCtl
+%{_sbindir}/dellLcdBrightness
+%{_sbindir}/dellWirelessCtl

 %files unsupported-bin 
 %defattr(555,root,root)
 %doc COPYING-GPL COPYING-OSL README include/smbios/config/boost_LICENSE_1_0_txt bin-unsupported/getopts_LICENSE.txt
-%{_bindir}/activateCmosToken
-%{_bindir}/ascii2enUS_scancode
-%{_bindir}/createUnitTestFiles
-%{_bindir}/disable_console_redir
-%{_bindir}/dumpCmos
-%{_bindir}/dellLEDCtl
-%{_bindir}/getPasswordFormat
-%{_bindir}/isCmosTokenActive
-%{_bindir}/probes
-%{_bindir}/smitest
-%{_bindir}/stateByteCtl
-%{_bindir}/upBootCtl
+%{_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
 %if %{build_xml}

 %files -n libsmbiosxml-bin 
 %defattr(555,root,root)
-%{_bindir}/dumpSmbios
+%{_sbindir}/dumpSmbios
 %endif
 %if %{build_static}

@ -254,6 +252,12 @@ ldconfig
 %{_bindir}/*S
 %endif
 %changelog
+* Sun Nov 04 2007 - dkukawka@suse.de
+- updated to new version 0.13.12:
+- removed upstream gone patch:
+  - libsmbios-fix-includes.diff
+- fixed spec-file:
+  - binaries moved from /usr/bin to /usr/sbin
 * Tue Oct 16 2007 - dkukawka@suse.de
 - updated to new version 0.13.10:
  - Fix a couple of failure-to-check-return on fopen. most were