update to latest upstream

.cvsignore

@@ -1 +1 @@
-libsmbios-2.2.15.tar.bz2
+libsmbios-2.2.16.tar.bz2

0001-fix-pointer-aliasing-issue-in-c-id-byte-code.patch

@@ -1,51 +0,0 @@
-From b3b25e94ffaa2136f66938884557eb3103ea90ef Mon Sep 17 00:00:00 2001
-From: Michael E Brown <mebrown@michaels-house.net>
-Date: Tue, 24 Mar 2009 02:10:34 -0500
-Subject: [PATCH] fix pointer aliasing issue in c++ id byte code.
-
----
- src/libsmbios_c++/systeminfo/IdByte.cpp |    9 +++------
- 1 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/libsmbios_c++/systeminfo/IdByte.cpp b/src/libsmbios_c++/systeminfo/IdByte.cpp
-index 28f5cbc..5f42336 100644
---- a/src/libsmbios_c++/systeminfo/IdByte.cpp
-+++ b/src/libsmbios_c++/systeminfo/IdByte.cpp
-@@ -53,9 +53,6 @@ static u16 getIdByteFromMem ()
-     memory::IMemory *mem = 0;
- 
-     struct two_byte_structure tbs;
--    struct two_byte_structure *ptbs = &tbs;
--    struct one_byte_structure *pobs =
--                    reinterpret_cast<one_byte_structure*>(&(tbs.bios_version));
- 
-     mem = memory::MemoryFactory::getFactory()->getSingleton();
- 
-@@ -69,13 +66,13 @@ static u16 getIdByteFromMem ()
-         goto out;
- 
-     // Step 2: fill the id structs
--    mem->fillBuffer( reinterpret_cast<u8 *>(ptbs), TWO_BYTE_STRUCT_LOC, sizeof(two_byte_structure) );
-+    mem->fillBuffer( reinterpret_cast<u8 *>(&tbs), TWO_BYTE_STRUCT_LOC, sizeof(two_byte_structure) );
- 
-     // Step 3: check the checksum of one-byte struct
-     //    update: checksum is not reliable, so don't use it...
- 
-     // Step 4: Check one byte ID
--    tempWord = pobs->system_id;
-+    tempWord = tbs.system_id;
- 
-     // Step 5: if 0xFE, then it is a double byte (word) ID.
-     // *  -- byte at 0xFE845 is 0xFE
-@@ -86,7 +83,7 @@ static u16 getIdByteFromMem ()
-         //*  -- extension checksum is 0
- 
-         // Step 7: get ID.
--        tempWord = ptbs->two_byte_id;
-+        tempWord = tbs.two_byte_id;
-     }
- 
-     idWord = tempWord;
--- 
-1.6.0.6
-

0003-upgrade-known-version-of-gcc-to-4.5.patch

@@ -1,41 +0,0 @@
-From d601364eb3ee592eaf7a414f748d794d46785f01 Mon Sep 17 00:00:00 2001
-From: Michael E Brown <mebrown@michaels-house.net>
-Date: Tue, 24 Mar 2009 01:44:14 -0500
-Subject: [PATCH] upgrade known version of gcc to 4.5
-
----
- src/include/smbios/config/compiler/gcc.hpp |    3 +--
- src/include/smbios_c/config/compiler/gcc.h |    3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/include/smbios/config/compiler/gcc.hpp b/src/include/smbios/config/compiler/gcc.hpp
-index d42d038..0891255 100644
---- a/src/include/smbios/config/compiler/gcc.hpp
-+++ b/src/include/smbios/config/compiler/gcc.hpp
-@@ -113,8 +113,7 @@
- #  error "Compiler not configured - please reconfigure"
- #endif
- //
--// last known and checked version is 3.4:
--#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 3))
-+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))
- #  if defined(LIBSMBIOS_ASSERT_CONFIG)
- #     error "Unknown compiler version - please run the configure tests and report the results"
- #  else
-diff --git a/src/include/smbios_c/config/compiler/gcc.h b/src/include/smbios_c/config/compiler/gcc.h
-index d542f65..8d83d4d 100644
---- a/src/include/smbios_c/config/compiler/gcc.h
-+++ b/src/include/smbios_c/config/compiler/gcc.h
-@@ -23,8 +23,7 @@
- #  error "GCC versions < 2.90 not supported"
- #endif
- //
--// last known and checked version is 3.4:
--#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 4))
-+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))
- #  if defined(LIBSMBIOS_C_ASSERT_CONFIG)
- #     error "Unknown compiler version - please run the configure tests and report the results"
- #  else
--- 
-1.6.0.6
-

import.log

@@ -0,0 +1 @@
+libsmbios-2_2_16-2_1_fc10:HEAD:libsmbios-2.2.16-2.1.fc10.src.rpm:1242352432

libsmbios.spec

@@ -3,7 +3,7 @@
 # these are all substituted by autoconf
 %define major 2
 %define minor 2
-%define micro 15
+%define micro 16
 %define extra %{nil}
 %define lang_dom  libsmbios-2.2
 %define release_version %{major}.%{minor}.%{micro}%{extra}
@@ -42,6 +42,9 @@
 
 # suse/sles
 %if 0%{?suse_version}
+%if 0%{?suse_version} < 1000
+    %define valgrind_BR %{nil}
+%endif
 %if 0%{?suse_version} >= 1020
     # suse never added python-ctypes provides to python 2.5 :(
     %define ctypes_BR %{nil}
@@ -88,13 +91,11 @@
 
 Name: %{release_name}
 Version: %{release_version}
-Release: 3%{?dist}
+Release: 2.1%{?releasesuffix}%{?dist}
 License: GPLv2+ or OSL 2.1
 Summary: Libsmbios C/C++ shared libraries
 Group: System Environment/Libraries
 Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.bz2
-Patch0: 0003-upgrade-known-version-of-gcc-to-4.5.patch
-Patch1: 0001-fix-pointer-aliasing-issue-in-c-id-byte-code.patch
 URL: http://linux.dell.com/libsmbios/main
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: strace libxml2-devel gcc-c++ gettext doxygen %{valgrind_BR} %{cppunit_BR} %{fdupes_BR} %{pkgconfig_BR} %{python_devel_BR}
@@ -123,7 +124,7 @@ should use the libsmbios C interface.
 Summary: Python interface to Libsmbios C library
 Group: System Environment/Libraries
 Requires: %{release_name} = 0:%{version}-%{release}
-Requires: python %{ctypes_BR}
+Requires: python %{ctypes_BR} redhat-rpm-config
 
 %description -n python-smbios
 This package provides a Python interface to libsmbios
@@ -182,8 +183,6 @@ programs against libsmbios.
 
 %prep
 %setup -q -n libsmbios-%{version}
-%patch0 -p1
-%patch1 -p1
 find . -type d -exec chmod -f 755 {} \;
 find doc src -type f -exec chmod -f 644 {} \;
 chmod 755 src/cppunit/*.sh
@@ -367,11 +366,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.16-3
+* Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.16-1
 - add gcc 4.4 support
-- fix pointer aliasing issue
 
-* Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.15-2
+* Mon Mar 24 2009 Michael E Brown <michael_e_brown at dell.com> - 2.2.15-1
 - update to lastest upstream.
 - fixes bug in bios update on systems with versions like x.y.z.
 

sources

@@ -1 +1 @@
-f704da6b1cbd9d2d0e20c2348a29d854  libsmbios-2.2.15.tar.bz2
+678d5940f6c39fa631bc2ed406f2b313  libsmbios-2.2.16.tar.bz2