diff --git a/.gitignore b/.gitignore index c41b93d..79b643e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libsmbios-2.2.26.tar.bz2 /libsmbios-2.2.28.tar.bz2 +/libsmbios-2.3.0.tar.bz2 diff --git a/0001-Don-t-force-the-compiler-version-check-on-consumers-.patch b/0001-Don-t-force-the-compiler-version-check-on-consumers-.patch deleted file mode 100644 index 4f577e8..0000000 --- a/0001-Don-t-force-the-compiler-version-check-on-consumers-.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 74913b28e3a436a6c519f66332a0b140bf72aa67 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 25 Feb 2016 15:22:57 -0500 -Subject: [PATCH] Don't force the compiler version check on consumers of the - library. - -This check just stops things from building when the compiler gets -upgraded, and it clearly hasn't been maintained in some time. The .so -almost certainly still works fine, and if the headers don't, the -consuming build will fail anyway. - -Signed-off-by: Peter Jones ---- - Makefile.am | 6 +++--- - Makefile.in | 6 +++--- - src/include/smbios/config/compiler/gcc.hpp | 2 ++ - src/include/smbios/config/compiler/sunpro_cc.hpp | 4 ++++ - src/include/smbios/config/compiler/visualc.hpp | 2 ++ - src/include/smbios_c/config/compiler/gcc.h | 4 ++-- - src/include/smbios_c/config/compiler/visualc.h | 2 ++ - 7 files changed, 18 insertions(+), 8 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 99277f6..2395fea 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -17,9 +17,9 @@ lib_LTLIBRARIES= - - TESTS= - --AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\" --AM_CFLAGS = -Wall --AM_CXXFLAGS = -Wall -+AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\" -DLIBSMBIOS_BUILD -+AM_CFLAGS = -Wall -DLIBSMBIOS_BUILD -+AM_CXXFLAGS = -Wall -DLIBSMBIOS_BUILD - AM_LDADD = $(LIBINTL) - - AM_LDFLAGS = -L$(top_builddir)/out/ -diff --git a/Makefile.in b/Makefile.in -index 660bcfa..db614a5 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -894,9 +894,9 @@ check_SCRIPTS = - noinst_LTLIBRARIES = out/libgetopt.la - lib_LTLIBRARIES = $(am__append_3) out/libsmbios_c.la - TESTS = src/pyunit/runtests.sh $(am__append_27) --AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\" --AM_CFLAGS = -Wall --AM_CXXFLAGS = -Wall -+AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\" -DLIBSMBIOS_BUILD -+AM_CFLAGS = -Wall -DLIBSMBIOS_BUILD -+AM_CXXFLAGS = -Wall -DLIBSMBIOS_BUILD - AM_LDADD = $(LIBINTL) - AM_LDFLAGS = -L$(top_builddir)/out/ $(am__append_1) $(am__append_2) - -diff --git a/src/include/smbios/config/compiler/gcc.hpp b/src/include/smbios/config/compiler/gcc.hpp -index 0891255..df0c240 100644 ---- a/src/include/smbios/config/compiler/gcc.hpp -+++ b/src/include/smbios/config/compiler/gcc.hpp -@@ -113,6 +113,7 @@ - # error "Compiler not configured - please reconfigure" - #endif - // -+#ifdef LIBSMBIOS_BUILD - #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" -@@ -120,5 +121,6 @@ - # warning "Unknown compiler version - please run the configure tests and report the results" - # endif - #endif -+#endif - - -diff --git a/src/include/smbios/config/compiler/sunpro_cc.hpp b/src/include/smbios/config/compiler/sunpro_cc.hpp -index 64e5c7e..efee3b2 100644 ---- a/src/include/smbios/config/compiler/sunpro_cc.hpp -+++ b/src/include/smbios/config/compiler/sunpro_cc.hpp -@@ -11,6 +11,7 @@ - - // Sun C++ compiler setup: - -+#ifdef LIBSMBIOS_BUILD - # if __SUNPRO_CC <= 0x500 - # define LIBSMBIOS_NO_MEMBER_TEMPLATES - # define LIBSMBIOS_NO_FUNCTION_TEMPLATE_ORDERING -@@ -68,6 +69,7 @@ - # if (__SUNPRO_CC <= 0x580) - # define LIBSMBIOS_NO_IS_ABSTRACT - # endif -+#endif - - // - // Issues that effect all known versions: -@@ -123,11 +125,13 @@ - #endif - // - // last known and checked version is 0x590: -+#ifdef LIBSMBIOS_BUILD - #if (__SUNPRO_CC > 0x590) - # if defined(LIBSMBIOS_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # endif - #endif -+#endif - - #ifndef UNREFERENCED_PARAMETER - #define UNREFERENCED_PARAMETER(P) ((void)(P)) -diff --git a/src/include/smbios/config/compiler/visualc.hpp b/src/include/smbios/config/compiler/visualc.hpp -index 564b09b..d244898 100644 ---- a/src/include/smbios/config/compiler/visualc.hpp -+++ b/src/include/smbios/config/compiler/visualc.hpp -@@ -171,6 +171,7 @@ - #endif - // - // last known and checked version is 1310: -+#ifdef LIBSMBIOS_BUILD - #if (_MSC_VER > 1400) - # if defined(LIBSMBIOS_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" -@@ -178,3 +179,4 @@ - # pragma message("Unknown compiler version - please run the configure tests and report the results") - # endif - #endif -+#endif -diff --git a/src/include/smbios_c/config/compiler/gcc.h b/src/include/smbios_c/config/compiler/gcc.h -index f46b8dc..0d5937e 100644 ---- a/src/include/smbios_c/config/compiler/gcc.h -+++ b/src/include/smbios_c/config/compiler/gcc.h -@@ -24,6 +24,7 @@ - # error "GCC versions < 2.90 not supported" - #endif - // -+#ifdef LIBSMBIOS_BUILD - #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 7)) - # if defined(LIBSMBIOS_C_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" -@@ -31,5 +32,4 @@ - # warning "Unknown compiler version - please run the configure tests and report the results" - # endif - #endif -- -- -+#endif -diff --git a/src/include/smbios_c/config/compiler/visualc.h b/src/include/smbios_c/config/compiler/visualc.h -index 545d4ef..f44ab62 100644 ---- a/src/include/smbios_c/config/compiler/visualc.h -+++ b/src/include/smbios_c/config/compiler/visualc.h -@@ -53,6 +53,7 @@ - #endif - // - // last known and checked version is 1310: -+#ifdef LIBSMBIOS_BUILD - #if (_MSC_VER > 1500) - # if defined(LIBSMBIOS_C_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" -@@ -60,3 +61,4 @@ - # pragma message("Unknown compiler version - please run the configure tests and report the results") - # endif - #endif -+#endif --- -2.5.0 - diff --git a/0001-reverting-the-patch-3304b513.patch b/0001-reverting-the-patch-3304b513.patch deleted file mode 100644 index 82c0efc..0000000 --- a/0001-reverting-the-patch-3304b513.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 7f0779b2c71ff40ecc5c1d917c5391da824a80e3 Mon Sep 17 00:00:00 2001 -From: SriniG -Date: Mon, 23 Jun 2014 16:19:59 +0530 -Subject: [PATCH] reverting the patch 3304b513. During installation, OM - installer checks for "OEM String". Re-enabling the patch to disable OME - String for smbios-sys-info-lite - ---- - src/bin/smbios-sys-info-lite.c | 34 ++++++++++++++++++++-------------- - 1 file changed, 20 insertions(+), 14 deletions(-) - -diff --git a/src/bin/smbios-sys-info-lite.c b/src/bin/smbios-sys-info-lite.c -index 6ee44ce..75b2452 100644 ---- a/src/bin/smbios-sys-info-lite.c -+++ b/src/bin/smbios-sys-info-lite.c -@@ -35,6 +35,9 @@ - #define gettext_noop(String) String - #define N_(String) gettext_noop (String) - -+/* 0x0B is the OEM Strings smbios structure */ -+#define SMBIOS_TBL_OEM_Strings 0x0B -+ - struct options opts[] = - { - { 254, "memory_file", N_("Debug: Memory dump file to use instead of physical memory"), "m", 1 }, -@@ -42,6 +45,22 @@ struct options opts[] = - { 0, NULL, NULL, NULL, 0 } - }; - -+/* Print out all the OEM strings */ -+static int print_oem_strings() -+{ -+ int i=0; -+ smbios_for_each_struct_type(s, SMBIOS_TBL_OEM_Strings) { -+ const char *str = 0; -+ i=1; // SMBIOS strings always start at index 1. -+ while(1) { -+ str = smbios_struct_get_string_number(s, i); -+ if(!str) break; -+ printf(_("OEM String %d: %s\n"), i, str); -+ i++; -+ } -+ } -+} -+ - int - main (int argc, char **argv) - { -@@ -154,20 +173,7 @@ main (int argc, char **argv) - - printf(_("Is Dell: %d\n"), (sysid!=0)); - --#if 0 -- // Print out all the OEM strings -- // 0x0B is the OEM Strings smbios structure -- smbios_for_each_struct_type(s, 0x0B) { -- const char *str = 0; -- int i=1; // SMBIOS strings always start at index 1. -- while(1) { -- str = smbios_struct_get_string_number(s, i); -- if(!str) break; -- printf(_("OEM String %d: %s\n"), i, str); -- i++; -- } -- } --#endif -+ print_oem_strings(); - - return retval; - } --- -2.4.3 - diff --git a/libsmbios.spec b/libsmbios.spec index 6ac719d..dee9e0b 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -4,12 +4,12 @@ # these are all substituted by autoconf %define major 2 -%define minor 2 -%define micro 28 +%define minor 3 +%define micro 0 %define extra %{nil} %define pot_file libsmbios -%define lang_dom libsmbios-2.2-x86_64 -%define release_version 2.2.28 +%define lang_dom libsmbios-2.3-x86_64 +%define release_version 2.3.0 %define release_name libsmbios %define other_name libsmbios2 @@ -99,13 +99,11 @@ Name: %{release_name} Version: %{release_version} -Release: 16%{?dist} +Release: 1%{?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: 0001-reverting-the-patch-3304b513.patch -Patch1: 0001-Don-t-force-the-compiler-version-check-on-consumers-.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} @@ -216,8 +214,6 @@ substitutions in yum repository configuration files on Dell systems. : '########################################' : '########################################' %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 @@ -280,6 +276,7 @@ cd _build TOPDIR=.. make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" mkdir -p %{buildroot}/%{_includedir} +mkdir -p %{buildroot}/%{_bindir} cp -a $TOPDIR/src/include/* %{buildroot}/%{_includedir}/ cp -a out/public-include/* %{buildroot}/%{_includedir}/ rm -f %{buildroot}/%{_libdir}/lib*.{la,a} @@ -324,6 +321,8 @@ cat > files-smbios-utils-python <<-EOF %{_sbindir}/smbios-wireless-ctl %{_sbindir}/smbios-rbu-bios-update %{_sbindir}/smbios-lcd-brightness + %{_sbindir}/smbios-keyboard-ctl + %{_sbindir}/smbios-thermal-ctl # symlinks: backwards compat %{_sbindir}/dellLcdBrightness @@ -401,6 +400,8 @@ rm -rf %{buildroot} %{_sbindir}/smbios-get-ut-data %{_sbindir}/smbios-upflag-ctl %{_sbindir}/smbios-sys-info-lite +%{_sbindir}/smbios-keyboard-ctl +%{_sbindir}/smbios-thermal-ctl %files -n python-smbios -f _build/files-python-smbios %defattr(-,root,root,-) diff --git a/sources b/sources index aec5977..6a48607 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e167e8d108e287defc3c461f50ef159 libsmbios-2.2.28.tar.bz2 +9ce77e040483129dfef99cf93231efce libsmbios-2.3.0.tar.bz2