Hello community,
here is the log from the commit of package libsmbios
checked in at Mon Nov 5 12:27:25 CET 2007.
--------
--- arch/i386/libsmbios/libsmbios.changes 2007-10-16 14:36:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/libsmbios/libsmbios.changes 2007-11-05 12:21:57.000000000 +0100
@@ -1,0 +2,9 @@
+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
+
+-------------------------------------------------------------------
Old:
----
libsmbios-0.13.10.tar.bz2
libsmbios-fix-includes.diff
New:
----
libsmbios-0.13.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libsmbios.spec ++++++
--- /var/tmp/diff_new_pack.c10743/_old 2007-11-05 12:27:06.000000000 +0100
+++ /var/tmp/diff_new_pack.c10743/_new 2007-11-05 12:27:06.000000000 +0100
@@ -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 @@
%{?_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 @@
%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 @@
%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 @@
%{_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
++++++ libsmbios-0.13.10.tar.bz2 -> libsmbios-0.13.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/assetTag.cpp new/libsmbios-0.13.12/bin-supported/assetTag.cpp
--- old/libsmbios-0.13.10/bin-supported/assetTag.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/assetTag.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -23,6 +23,7 @@
#include <iostream>
#include <iomanip>
#include
+#include
#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)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/dellBiosUpdate.cpp new/libsmbios-0.13.12/bin-supported/dellBiosUpdate.cpp
--- old/libsmbios-0.13.10/bin-supported/dellBiosUpdate.cpp 2007-07-21 01:36:29.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/dellBiosUpdate.cpp 2007-10-20 00:38:12.000000000 +0200
@@ -20,6 +20,7 @@
#include "smbios/compat.h"
#include <iostream>
+#include
#include "smbios/DellRbu.h"
#include "smbios/SystemInfo.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/dellLcdBrightness.cpp new/libsmbios-0.13.12/bin-supported/dellLcdBrightness.cpp
--- old/libsmbios-0.13.10/bin-supported/dellLcdBrightness.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/dellLcdBrightness.cpp 2007-10-20 00:16:12.000000000 +0200
@@ -23,6 +23,7 @@
#include <iostream>
#include <iomanip>
#include
+#include
#include "smbios/ISmi.h"
#include "smbios/IToken.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/dellWirelessCtl.cpp new/libsmbios-0.13.12/bin-supported/dellWirelessCtl.cpp
--- old/libsmbios-0.13.10/bin-supported/dellWirelessCtl.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/dellWirelessCtl.cpp 2007-10-20 00:16:15.000000000 +0200
@@ -23,6 +23,7 @@
#include <iostream>
#include <iomanip>
#include
+#include
#include "smbios/ISmi.h"
#include "smbios/IToken.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/Makefile.am new/libsmbios-0.13.12/bin-supported/Makefile.am
--- old/libsmbios-0.13.10/bin-supported/Makefile.am 2007-07-21 01:36:29.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/Makefile.am 2007-10-20 00:08:28.000000000 +0200
@@ -1,6 +1,6 @@
# vim:tw=0:et:ts=4:sw=4
-bin_PROGRAMS += \
+sbin_PROGRAMS += \
bin-supported/assetTag \
bin-supported/getSystemId \
bin-supported/propertyTag \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/propertyTag.cpp new/libsmbios-0.13.12/bin-supported/propertyTag.cpp
--- old/libsmbios-0.13.10/bin-supported/propertyTag.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/propertyTag.cpp 2007-10-20 00:16:24.000000000 +0200
@@ -23,6 +23,7 @@
#include <iostream>
#include <iomanip>
#include
+#include
#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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/serviceTag.cpp new/libsmbios-0.13.12/bin-supported/serviceTag.cpp
--- old/libsmbios-0.13.10/bin-supported/serviceTag.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/serviceTag.cpp 2007-10-20 00:16:27.000000000 +0200
@@ -23,6 +23,7 @@
#include <iostream>
#include <iomanip>
#include
+#include
#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)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/tokenCtl.cpp new/libsmbios-0.13.12/bin-supported/tokenCtl.cpp
--- old/libsmbios-0.13.10/bin-supported/tokenCtl.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/tokenCtl.cpp 2007-10-20 00:16:30.000000000 +0200
@@ -36,6 +36,7 @@
#include <iostream>
#include <iomanip>
#include
+#include
#include "smbios/IToken.h"
#include "smbios/IMemory.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-supported/verifySmiPassword.cpp new/libsmbios-0.13.12/bin-supported/verifySmiPassword.cpp
--- old/libsmbios-0.13.10/bin-supported/verifySmiPassword.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-supported/verifySmiPassword.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -20,6 +20,7 @@
#include "smbios/compat.h"
#include <iostream>
+#include
#include "smbios/ISmi.h"
#include "smbios/SystemInfo.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-unsupported/ascii2enUS_scancode.cpp new/libsmbios-0.13.12/bin-unsupported/ascii2enUS_scancode.cpp
--- old/libsmbios-0.13.10/bin-unsupported/ascii2enUS_scancode.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-unsupported/ascii2enUS_scancode.cpp 2007-10-20 00:16:39.000000000 +0200
@@ -20,6 +20,7 @@
#include "smbios/compat.h"
#include <iostream>
+#include
#include "smbios/ISmi.h"
#include "smbios/version.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-unsupported/dellLEDCtl.cpp new/libsmbios-0.13.12/bin-unsupported/dellLEDCtl.cpp
--- old/libsmbios-0.13.10/bin-unsupported/dellLEDCtl.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-unsupported/dellLEDCtl.cpp 2007-10-20 00:15:13.000000000 +0200
@@ -30,6 +30,7 @@
#include
#endif
#include
+#include
#include "smbios/ISmi.h"
#include "smbios/IToken.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-unsupported/Makefile.am new/libsmbios-0.13.12/bin-unsupported/Makefile.am
--- old/libsmbios-0.13.10/bin-unsupported/Makefile.am 2007-07-21 01:36:29.000000000 +0200
+++ new/libsmbios-0.13.12/bin-unsupported/Makefile.am 2007-10-20 00:08:28.000000000 +0200
@@ -1,5 +1,5 @@
# vim:tw=0:et:ts=4:sw=4
-bin_PROGRAMS += \
+sbin_PROGRAMS += \
bin-unsupported/activateCmosToken \
bin-unsupported/createUnitTestFiles \
bin-unsupported/disable_console_redir \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/bin-unsupported/smitest.cpp new/libsmbios-0.13.12/bin-unsupported/smitest.cpp
--- old/libsmbios-0.13.10/bin-unsupported/smitest.cpp 2007-05-24 17:46:23.000000000 +0200
+++ new/libsmbios-0.13.12/bin-unsupported/smitest.cpp 2007-10-20 00:17:02.000000000 +0200
@@ -23,6 +23,7 @@
#include <iostream>
#include <iomanip>
#include
+#include
#include "smbios/ISmi.h" // only needed if you want to use fake input (memdump.dat)
#include "getopts.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/configure new/libsmbios-0.13.12/configure
--- old/libsmbios-0.13.10/configure 2007-08-28 01:14:10.000000000 +0200
+++ new/libsmbios-0.13.12/configure 2007-11-02 19:16:21.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libsmbios 0.13.10.
+# Generated by GNU Autoconf 2.61 for libsmbios 0.13.12.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
# Identity of this package.
PACKAGE_NAME='libsmbios'
PACKAGE_TARNAME='libsmbios'
-PACKAGE_VERSION='0.13.10'
-PACKAGE_STRING='libsmbios 0.13.10'
+PACKAGE_VERSION='0.13.12'
+PACKAGE_STRING='libsmbios 0.13.12'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1402,7 +1402,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libsmbios 0.13.10 to adapt to many kinds of systems.
+\`configure' configures libsmbios 0.13.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1472,7 +1472,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libsmbios 0.13.10:";;
+ short | recursive ) echo "Configuration of libsmbios 0.13.12:";;
esac
cat <<\_ACEOF
@@ -1581,7 +1581,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libsmbios configure 0.13.10
+libsmbios configure 0.13.12
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1595,7 +1595,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libsmbios $as_me 0.13.10, which was
+It was created by libsmbios $as_me 0.13.12, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1952,7 +1952,7 @@
temp_RELEASE_NAME=libsmbios
temp_RELEASE_MAJOR=0
temp_RELEASE_MINOR=13
-temp_RELEASE_SUBLEVEL=10
+temp_RELEASE_SUBLEVEL=12
temp_RELEASE_EXTRALEVEL=
####################################
@@ -2294,7 +2294,7 @@
# Define the identity of the package.
PACKAGE='libsmbios'
- VERSION='0.13.10'
+ VERSION='0.13.12'
cat >>confdefs.h <<_ACEOF
@@ -21542,6 +21542,7 @@
+# this is used by the autobuilder hook to determine the version we built
echo "PACKAGE_NAME='$PACKAGE_NAME'" > version
echo "PACKAGE_VERSION='$PACKAGE_VERSION'" >> version
echo "PACKAGE_STRING='$PACKAGE_STRING'" >> version
@@ -22031,7 +22032,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libsmbios $as_me 0.13.10, which was
+This file was extended by libsmbios $as_me 0.13.12, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22078,7 +22079,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libsmbios config.status 0.13.10
+libsmbios config.status 0.13.12
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/configure.ac new/libsmbios-0.13.12/configure.ac
--- old/libsmbios-0.13.10/configure.ac 2007-08-28 01:14:10.000000000 +0200
+++ new/libsmbios-0.13.12/configure.ac 2007-11-02 19:15:57.000000000 +0100
@@ -4,12 +4,12 @@
####################################
# change version here.
-AC_INIT([libsmbios],[0.13.10])
+AC_INIT([libsmbios],[0.13.12])
temp_RELEASE_NAME=libsmbios
temp_RELEASE_MAJOR=0
temp_RELEASE_MINOR=13
-temp_RELEASE_SUBLEVEL=10
+temp_RELEASE_SUBLEVEL=12
temp_RELEASE_EXTRALEVEL=
####################################
@@ -126,6 +126,7 @@
AC_SUBST([RELEASE_NAME RELEASE_MAJOR RELEASE_MINOR RELEASE_SUBLEVEL RELEASE_EXTRALEVEL RELEASE_RPM_EXTRALEVEL])
AC_SUBST([ LIBSMBIOS_LIBTOOL_CURRENT LIBSMBIOS_LIBTOOL_REVISION LIBSMBIOS_LIBTOOL_AGE LIBSMBIOSXML_LIBTOOL_CURRENT LIBSMBIOSXML_LIBTOOL_REVISION LIBSMBIOSXML_LIBTOOL_AGE ])
+# this is used by the autobuilder hook to determine the version we built
echo "PACKAGE_NAME='$PACKAGE_NAME'" > version
echo "PACKAGE_VERSION='$PACKAGE_VERSION'" >> version
echo "PACKAGE_STRING='$PACKAGE_STRING'" >> version
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/doc/DellToken.txt new/libsmbios-0.13.12/doc/DellToken.txt
--- old/libsmbios-0.13.10/doc/DellToken.txt 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/doc/DellToken.txt 2007-11-02 19:15:25.000000000 +0100
@@ -142,6 +142,10 @@
+0x00ED SpeedStep_Disabled "Disables SpeedStep dynamic clock changes."
+0x00EE SpeedStep_Maximum_Performance "The system is placed in the maximum performance state available."
+0x00EF SpeedStep_Maximum_Battery "The system is placed in the minimum performance state available."
+0x00F0 SpeedStep_Automatic "Allows the BIOS to set either Max Performance, or Max Battery, based on AC presence."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/memory/Memory.cpp new/libsmbios-0.13.12/libraries/memory/Memory.cpp
--- old/libsmbios-0.13.10/libraries/memory/Memory.cpp 2007-08-21 08:16:20.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/memory/Memory.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -22,6 +22,7 @@
#include
#include
+#include
#include "MemoryImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/memory/Memory_Linux.cpp new/libsmbios-0.13.12/libraries/memory/Memory_Linux.cpp
--- old/libsmbios-0.13.10/libraries/memory/Memory_Linux.cpp 2007-08-21 08:16:20.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/memory/Memory_Linux.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -23,6 +23,7 @@
#include
#include /* mmap */
#include /* getpagesize */
+#include /* memcpy etc. */
#include "MemoryImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/smbios/SmbiosItem.cpp new/libsmbios-0.13.12/libraries/smbios/SmbiosItem.cpp
--- old/libsmbios-0.13.10/libraries/smbios/SmbiosItem.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/smbios/SmbiosItem.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -21,6 +21,7 @@
#include "smbios/compat.h"
#include <iomanip>
+#include
#include "SmbiosImpl.h"
// message.h should be included last.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/smbios/SmbiosStrategy.cpp new/libsmbios-0.13.12/libraries/smbios/SmbiosStrategy.cpp
--- old/libsmbios-0.13.10/libraries/smbios/SmbiosStrategy.cpp 2007-08-21 08:16:20.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/smbios/SmbiosStrategy.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -21,6 +21,7 @@
#include "smbios/compat.h"
#include <sstream>
+#include
#include "smbios/IMemory.h"
#include "SmbiosImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/smbios/SmbiosStrategy_Linux.cpp new/libsmbios-0.13.12/libraries/smbios/SmbiosStrategy_Linux.cpp
--- old/libsmbios-0.13.10/libraries/smbios/SmbiosStrategy_Linux.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/smbios/SmbiosStrategy_Linux.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -21,6 +21,7 @@
#include "smbios/compat.h"
#include <sstream>
+#include
#include "smbios/IMemory.h"
#include "SmbiosImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/smbios/SmbiosTable.cpp new/libsmbios-0.13.12/libraries/smbios/SmbiosTable.cpp
--- old/libsmbios-0.13.10/libraries/smbios/SmbiosTable.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/smbios/SmbiosTable.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -21,6 +21,7 @@
#include "smbios/compat.h"
#include <sstream>
+#include
#include "SmbiosImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/smbios/SmbiosWorkaround.cpp new/libsmbios-0.13.12/libraries/smbios/SmbiosWorkaround.cpp
--- old/libsmbios-0.13.10/libraries/smbios/SmbiosWorkaround.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/smbios/SmbiosWorkaround.cpp 2007-10-20 00:26:52.000000000 +0200
@@ -17,6 +17,10 @@
*/
#define LIBSMBIOS_SOURCE
+#include "smbios/compat.h"
+
+#include
+
#include "SmbiosWorkaroundImpl.h"
#include "smbios/SmbiosDefs.h"
#include "SmbiosImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/smi/Smi.cpp new/libsmbios-0.13.12/libraries/smi/Smi.cpp
--- old/libsmbios-0.13.10/libraries/smi/Smi.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/smi/Smi.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -21,6 +21,7 @@
#include "smbios/compat.h"
//#include <iostream>
+#include
#include "SmiImpl.h"
#include "smbios/ISmbios.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/smi/Smi_Linux.cpp new/libsmbios-0.13.12/libraries/smi/Smi_Linux.cpp
--- old/libsmbios-0.13.10/libraries/smi/Smi_Linux.cpp 2007-08-23 04:44:40.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/smi/Smi_Linux.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -21,6 +21,7 @@
#include "smbios/compat.h"
#include
+#include
#include "SmiImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/systeminfo/IdByte.cpp new/libsmbios-0.13.12/libraries/systeminfo/IdByte.cpp
--- old/libsmbios-0.13.10/libraries/systeminfo/IdByte.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/systeminfo/IdByte.cpp 2007-10-20 00:27:53.000000000 +0200
@@ -17,6 +17,10 @@
*/
#define LIBSMBIOS_SOURCE
+#include "smbios/compat.h"
+
+#include
+
#include "smbios/ISmbios.h"
#include "smbios/IToken.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/systeminfo/System.cpp new/libsmbios-0.13.12/libraries/systeminfo/System.cpp
--- old/libsmbios-0.13.10/libraries/systeminfo/System.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/systeminfo/System.cpp 2007-10-20 00:28:27.000000000 +0200
@@ -17,6 +17,10 @@
*/
#define LIBSMBIOS_SOURCE
+#include "smbios/compat.h"
+
+#include
+
#include "smbios/ISmbios.h"
#include "smbios/IToken.h"
#include "smbios/ISmi.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/systeminfo/SystemDetect.cpp new/libsmbios-0.13.12/libraries/systeminfo/SystemDetect.cpp
--- old/libsmbios-0.13.10/libraries/systeminfo/SystemDetect.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/systeminfo/SystemDetect.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -30,6 +30,8 @@
// all our magic numbers
#include "DellMagic.h"
+#include
+
// include this last.
#include "smbios/message.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/token/TokenD4.cpp new/libsmbios-0.13.12/libraries/token/TokenD4.cpp
--- old/libsmbios-0.13.10/libraries/token/TokenD4.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/token/TokenD4.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -21,6 +21,7 @@
#include "smbios/compat.h"
#include <iomanip>
+#include
#include "TokenImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/token/TokenD5.cpp new/libsmbios-0.13.12/libraries/token/TokenD5.cpp
--- old/libsmbios-0.13.10/libraries/token/TokenD5.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/token/TokenD5.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -22,6 +22,7 @@
#include <sstream>
#include <iomanip>
+#include
#include "TokenImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/token/TokenD6.cpp new/libsmbios-0.13.12/libraries/token/TokenD6.cpp
--- old/libsmbios-0.13.10/libraries/token/TokenD6.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/token/TokenD6.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -22,6 +22,7 @@
#include <sstream>
#include <iomanip>
+#include
#include "TokenImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/token/TokenDA.cpp new/libsmbios-0.13.12/libraries/token/TokenDA.cpp
--- old/libsmbios-0.13.10/libraries/token/TokenDA.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/token/TokenDA.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -21,6 +21,7 @@
#include "smbios/compat.h"
#include <iomanip>
+#include
#include "TokenImpl.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libraries/xml_libxml2/SmbiosXml.cpp new/libsmbios-0.13.12/libraries/xml_libxml2/SmbiosXml.cpp
--- old/libsmbios-0.13.10/libraries/xml_libxml2/SmbiosXml.cpp 2007-05-24 17:46:25.000000000 +0200
+++ new/libsmbios-0.13.12/libraries/xml_libxml2/SmbiosXml.cpp 2007-10-20 00:15:12.000000000 +0200
@@ -22,6 +22,7 @@
#include <sstream>
#include <iomanip>
+#include
#include "SmbiosXmlImpl.h"
#include "StdSmbiosXml.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libsmbios.spec new/libsmbios-0.13.12/libsmbios.spec
--- old/libsmbios-0.13.10/libsmbios.spec 2007-08-28 02:24:50.000000000 +0200
+++ new/libsmbios-0.13.12/libsmbios.spec 2007-11-02 19:30:03.000000000 +0100
@@ -1,7 +1,7 @@
# these are all substituted by autoconf
%define major 0
%define minor 13
-%define sub 10
+%define sub 12
%define extralevel %{nil}
%define release_name libsmbios
%define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -13,15 +13,18 @@
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)
+Obsoletes: libsmbiosxml-libs < 0:%{version}-%{release}
+Provides: libsmbiosxml-libs = %{version}-%{release}
+Obsoletes: libsmbios-libs < 0:0.13.11
+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,37 +38,26 @@
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}
-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}
+Requires: libsmbios = %{version}-%{release}
+Obsoletes: libsmbiosxml-bin < 0:0.13.11
Provides: libsmbiosxml-bin = %{version}-%{release}
-
-%package unsupported-bin
-Summary: Unsupported sample binaries using libsmbios
-Group: Applications/System
-Requires: libsmbios-libs = %{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
@@ -74,13 +66,7 @@
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.
@@ -105,20 +91,25 @@
[ ! -d /usr/include/cppunit ] || make -e check
%install
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
mkdir -p %{buildroot}/usr/include
cp -a include/smbios %{buildroot}/usr/include/
rm -f %{buildroot}/%{_libdir}/lib*.la
+find %{buildroot}/usr/include -exec touch -r configure.ac {} \;
+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.*
@@ -134,37 +125,39 @@
%{_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
-%{_bindir}/assetTag
-%{_bindir}/dellBiosUpdate
-%{_bindir}/getSystemId
-%{_bindir}/propertyTag
-%{_bindir}/serviceTag
-%{_bindir}/tokenCtl
-%{_bindir}/verifySmiPassword
-%{_bindir}/wakeupCtl
-%{_bindir}/dellLcdBrightness
+%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
-%{_bindir}/dellLEDCtl
-%{_bindir}/activateCmosToken
-%{_bindir}/ascii2enUS_scancode
-%{_bindir}/createUnitTestFiles
-%{_bindir}/disable_console_redir
-%{_bindir}/dumpCmos
-%{_bindir}/getPasswordFormat
-%{_bindir}/isCmosTokenActive
-%{_bindir}/probes
-%{_bindir}/smitest
-%{_bindir}/stateByteCtl
-%{_bindir}/upBootCtl
-%{_bindir}/dumpSmbios
-#%{_bindir}/sysid
+# community supported stuff...
+# may or may not work
+%{_sbindir}/dellLEDCtl
+%{_sbindir}/activateCmosToken
+%{_sbindir}/ascii2enUS_scancode
+%{_sbindir}/createUnitTestFiles
+%{_sbindir}/disable_console_redir
+%{_sbindir}/dumpCmos
+%{_sbindir}/getPasswordFormat
+%{_sbindir}/isCmosTokenActive
+%{_sbindir}/probes
+%{_sbindir}/smitest
+%{_sbindir}/stateByteCtl
+%{_sbindir}/upBootCtl
+%{_sbindir}/dumpSmbios
# ./ChangeLog is appended by configure
%changelog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/libsmbios.spec.in new/libsmbios-0.13.12/libsmbios.spec.in
--- old/libsmbios-0.13.10/libsmbios.spec.in 2007-08-28 01:14:10.000000000 +0200
+++ new/libsmbios-0.13.12/libsmbios.spec.in 2007-11-02 19:15:25.000000000 +0100
@@ -13,15 +13,18 @@
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)
+Obsoletes: libsmbiosxml-libs < 0:%{version}-%{release}
+Provides: libsmbiosxml-libs = %{version}-%{release}
+Obsoletes: libsmbios-libs < 0:0.13.11
+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,37 +38,26 @@
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}
-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}
+Requires: libsmbios = %{version}-%{release}
+Obsoletes: libsmbiosxml-bin < 0:0.13.11
Provides: libsmbiosxml-bin = %{version}-%{release}
-
-%package unsupported-bin
-Summary: Unsupported sample binaries using libsmbios
-Group: Applications/System
-Requires: libsmbios-libs = %{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
@@ -74,13 +66,7 @@
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.
@@ -105,20 +91,25 @@
[ ! -d /usr/include/cppunit ] || make -e check
%install
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
mkdir -p %{buildroot}/usr/include
cp -a include/smbios %{buildroot}/usr/include/
rm -f %{buildroot}/%{_libdir}/lib*.la
+find %{buildroot}/usr/include -exec touch -r configure.ac {} \;
+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.*
@@ -134,37 +125,39 @@
%{_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
-%{_bindir}/assetTag
-%{_bindir}/dellBiosUpdate
-%{_bindir}/getSystemId
-%{_bindir}/propertyTag
-%{_bindir}/serviceTag
-%{_bindir}/tokenCtl
-%{_bindir}/verifySmiPassword
-%{_bindir}/wakeupCtl
-%{_bindir}/dellLcdBrightness
+%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
-%{_bindir}/dellLEDCtl
-%{_bindir}/activateCmosToken
-%{_bindir}/ascii2enUS_scancode
-%{_bindir}/createUnitTestFiles
-%{_bindir}/disable_console_redir
-%{_bindir}/dumpCmos
-%{_bindir}/getPasswordFormat
-%{_bindir}/isCmosTokenActive
-%{_bindir}/probes
-%{_bindir}/smitest
-%{_bindir}/stateByteCtl
-%{_bindir}/upBootCtl
-%{_bindir}/dumpSmbios
-#%{_bindir}/sysid
+# community supported stuff...
+# may or may not work
+%{_sbindir}/dellLEDCtl
+%{_sbindir}/activateCmosToken
+%{_sbindir}/ascii2enUS_scancode
+%{_sbindir}/createUnitTestFiles
+%{_sbindir}/disable_console_redir
+%{_sbindir}/dumpCmos
+%{_sbindir}/getPasswordFormat
+%{_sbindir}/isCmosTokenActive
+%{_sbindir}/probes
+%{_sbindir}/smitest
+%{_sbindir}/stateByteCtl
+%{_sbindir}/upBootCtl
+%{_sbindir}/dumpSmbios
# ./ChangeLog is appended by configure
%changelog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/Makefile.am new/libsmbios-0.13.12/Makefile.am
--- old/libsmbios-0.13.10/Makefile.am 2007-07-24 21:58:59.000000000 +0200
+++ new/libsmbios-0.13.12/Makefile.am 2007-10-31 20:26:31.000000000 +0100
@@ -22,11 +22,12 @@
LIBSMBIOSXML_LIBTOOL_REVISION=@LIBSMBIOSXML_LIBTOOL_REVISION@
LIBSMBIOSXML_LIBTOOL_AGE=@LIBSMBIOSXML_LIBTOOL_AGE@
-CLEANFILES=libsmbios-*.tar.gz libsmbios-*.tar.bz2 libsmbios-*.rpm _buildtemp doc/reports/code-coverage.txt doc/reports/valgrind_output.txt doc/*.log doc/reports/*.txt version
+CLEANFILES=libsmbios-*.tar.gz libsmbios-*.tar.bz2 libsmbios-*.rpm _buildtemp doc/reports/code-coverage.txt doc/reports/valgrind_output.txt doc/*.log doc/reports/*.txt version smbios-utils*.rpm
DISTCLEANFILES=*~
EXTRA_DIST =
bin_PROGRAMS=
+sbin_PROGRAMS=
EXTRA_PROGRAMS=
include libraries/Makefile.am
@@ -35,6 +36,7 @@
include cppunit/Makefile.am
$(bin_PROGRAMS): libraries/libsmbios.la
+$(sbin_PROGRAMS): libraries/libsmbios.la
$(EXTRA_PROGRAMS): libraries/libsmbios.la
static: $(EXTRA_PROGRAMS)
CLEANFILES += $(EXTRA_PROGRAMS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libsmbios-0.13.10/Makefile.in new/libsmbios-0.13.12/Makefile.in
--- old/libsmbios-0.13.10/Makefile.in 2007-07-24 21:58:59.000000000 +0200
+++ new/libsmbios-0.13.12/Makefile.in 2007-11-02 19:16:23.000000000 +0100
@@ -41,7 +41,8 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = bin-supported/assetTag$(EXEEXT) \
+bin_PROGRAMS =
+sbin_PROGRAMS = bin-supported/assetTag$(EXEEXT) \
bin-supported/getSystemId$(EXEEXT) \
bin-supported/propertyTag$(EXEEXT) \
bin-supported/serviceTag$(EXEEXT) \
@@ -118,7 +119,8 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(sbindir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libraries_libsmbios_la_LIBADD =
@@ -171,7 +173,8 @@
$(libraries_libsmbiosxml_la_CXXFLAGS) $(CXXFLAGS) \
$(libraries_libsmbiosxml_la_LDFLAGS) $(LDFLAGS) -o $@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
am__objects_1 = bin-supported/getopts.$(OBJEXT)
am_bin_supported_assetTag_OBJECTS = bin-supported/assetTag.$(OBJEXT) \
$(am__objects_1)
@@ -889,9 +892,9 @@
CLEANFILES = libsmbios-*.tar.gz libsmbios-*.tar.bz2 libsmbios-*.rpm \
_buildtemp doc/reports/code-coverage.txt \
doc/reports/valgrind_output.txt doc/*.log doc/reports/*.txt \
- version libraries/common/StdSmbiosXml.h libraries/.libs \
- bin-supported/.libs bin-unsupported/.libs testResults.xml \
- cppunit/.libs $(EXTRA_PROGRAMS)
+ version smbios-utils*.rpm libraries/common/StdSmbiosXml.h \
+ libraries/.libs bin-supported/.libs bin-unsupported/.libs \
+ testResults.xml cppunit/.libs $(EXTRA_PROGRAMS)
DISTCLEANFILES = *~
########## END DOCS ################
EXTRA_DIST = libraries/cmos/CmosRW_WindowsIO.cpp \
@@ -1391,6 +1394,34 @@
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+uninstall-sbinPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+ done
+
+clean-sbinPROGRAMS:
+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
bin-supported/$(am__dirstamp):
@$(MKDIR_P) bin-supported
@: > bin-supported/$(am__dirstamp)
@@ -2586,7 +2617,7 @@
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -2642,7 +2673,8 @@
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
- clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ clean-libLTLIBRARIES clean-libtool clean-sbinPROGRAMS \
+ mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -2665,7 +2697,8 @@
install-dvi: install-dvi-recursive
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \
+ install-sbinPROGRAMS
install-html: install-html-recursive
@@ -2699,7 +2732,8 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
+uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+ uninstall-sbinPROGRAMS
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-strip
@@ -2707,22 +2741,23 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-TESTS check-am clean \
clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags ctags-recursive dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \
- dist-zip distcheck distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-libLTLIBRARIES \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-libLTLIBRARIES
+ clean-libLTLIBRARIES clean-libtool clean-sbinPROGRAMS ctags \
+ ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-sbinPROGRAMS install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+ uninstall-sbinPROGRAMS
libraries/common/StdSmbiosXml.h: Makefile.am $(top_srcdir)/doc/smbios23.xml $(top_srcdir)/build/scripts/makeXmlHeader.py
@@ -2742,6 +2777,7 @@
$(libraries_libsmbiosxml_la_OBJECTS): libraries/common/StdSmbiosXml.h
$(bin_PROGRAMS): libraries/libsmbios.la
+$(sbin_PROGRAMS): libraries/libsmbios.la
$(EXTRA_PROGRAMS): libraries/libsmbios.la
static: $(EXTRA_PROGRAMS)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org