From f29218c4d01eb65750848efb544583442804559c5c2aff7358c9b7b7b657af41 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 26 Mar 2007 23:54:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsmbios?expand=0&rev=3 --- libsmbios-0.12.4.tar.bz2 | 3 -- libsmbios-0.13.4.tar.bz2 | 3 ++ libsmbios.changes | 8 +++++ libsmbios.spec | 77 +++++++++++++++++++++------------------- 4 files changed, 51 insertions(+), 40 deletions(-) delete mode 100644 libsmbios-0.12.4.tar.bz2 create mode 100644 libsmbios-0.13.4.tar.bz2 diff --git a/libsmbios-0.12.4.tar.bz2 b/libsmbios-0.12.4.tar.bz2 deleted file mode 100644 index c97dee7..0000000 --- a/libsmbios-0.12.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7172e20769757e438de847b2cceee40b773a1367f4ff2861fb4d30ffbb2adffc -size 4217969 diff --git a/libsmbios-0.13.4.tar.bz2 b/libsmbios-0.13.4.tar.bz2 new file mode 100644 index 0000000..732ae36 --- /dev/null +++ b/libsmbios-0.13.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25a3ff9d60dbf61d01c67388a33162489767c62ec9dfd0e3e308301108a2aa67 +size 3205023 diff --git a/libsmbios.changes b/libsmbios.changes index 91a5478..2436dac 100644 --- a/libsmbios.changes +++ b/libsmbios.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 26 14:56:54 CEST 2007 - dkukawka@suse.de + +- updated to new version 0.13.4 as requested by DELL maintainer + - autotools conversion + - new util dellWirelessCtl to control builtin wireless on Dell + laptops + ------------------------------------------------------------------- Sun Mar 4 00:37:22 CET 2007 - dkukawka@suse.de diff --git a/libsmbios.spec b/libsmbios.spec index d7f67e0..4810810 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -1,5 +1,5 @@ # -# spec file for package libsmbios (Version 0.12.4) +# spec file for package libsmbios (Version 0.13.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,32 +10,29 @@ Name: libsmbios -BuildRequires: Xerces-c-devel gcc-c++ glibc-devel libxml libxml2-devel +BuildRequires: Xerces-c-devel cppunit-devel gcc-c++ glibc-devel libxml libxml2-devel tree URL: http://linux.dell.com/libsmbios/main/index.html -%define _unpackaged_files_terminate_build 0 +%define _unpackaged_files_terminate_build 0 +%define build_static 0 # automatically determine if we should build xml %define build_xml %( ([ -e /usr/include/xercesc/ ] && echo 1) || echo 0 ) # automatically determine if we should build docs %define build_docs %( ( which doxygen > /dev/null 2>&1 && echo 1) || echo 0 ) -# build rpm containing everything statically linked -%define build_static 0 -# allow --with[out] at rpm command line build, to override the above -# e.g. --with xml ...or... --without xml -%{?_without_xml: %{expand: %%define build_xml 0}} -%{?_with_xml: %{expand: %%define build_xml 1}} -%{?_without_static: %{expand: %%define build_static 0}} -%{?_with_static: %{expand: %%define build_static 1}} +%define run_cppunit %( ([ -e /usr/include/cppunit ] && echo 1) || echo 0) %{?_without_docs: %{expand: %%define build_docs 0}} %{?_with_docs: %{expand: %%define build_docs 1}} -%{?_without_butrpm: %{expand: %%define build_butrpm 0}} -%{?_with_butrpm: %{expand: %%define build_butrpm 1}} -# if passed a "dist" variable, use it. Otherwise, not. -%{!?dist: %{expand: %%define relver 1}} -%{?dist: %{expand: %%define relver 1.%{dist}}} -Version: 0.12.4 +%{?_without_cppunit: %{expand: %%define run_cppunit 0}} +%{?_with_cppunit: %{expand: %%define run_cppunit 1}} +%define major 0 +%define minor 13 +%define sub 4 +%define extralevel %{nil} +%define release_name libsmbios +%define release_version %{major}.%{minor}.%{sub}%{extralevel} +Version: 0.13.4 Release: 1 -License: GNU General Public License (GPL) -Source: libsmbios-0.12.4.tar.bz2 +License: BSD License and BSD-like, GNU General Public License (GPL) +Source: %{name}-%{version}.tar.bz2 Summary: Open BIOS parsing libs Group: System/Management BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -161,25 +158,25 @@ Authors: %prep %setup +find . -type d -exec chmod -f 755 {} \; +find doc include libraries bins build supported-bins cppunit -type f -exec chmod -f 644 {} \; %build -make default -%if %{build_static} - make static -%endif -%if %{build_xml} - make xml -%endif +%configure +make %{?_smp_mflags} EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} %if %{build_docs} - make doxygen + make -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} doxygen +%endif +%if %{run_cppunit} + make -e EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} unit_test %endif %install -install -d -m 755 $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/usr/include/ -install -p -D -m 555 supported-bins/output/* $RPM_BUILD_ROOT/%{_bindir} -install -p -D -m 555 bins/output/* $RPM_BUILD_ROOT/%{_bindir} -cp -p lib/libsmbios* $RPM_BUILD_ROOT/%{_libdir}/ -cp -a include/smbios $RPM_BUILD_ROOT/usr/include/ +[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +mkdir -p %{buildroot}/usr/include +cp -a include/smbios %{buildroot}/usr/include/ +rm -f %{buildroot}/%{_libdir}/lib*.la %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf ${RPM_BUILD_ROOT} @@ -202,14 +199,15 @@ ldconfig %files devel %defattr(-,root,root) +%doc COPYING-GPL COPYING-OSL README bins/getopts_LICENSE.txt %if %{build_docs} %doc doc/full/html %endif %{_libdir}/libsmbios.so -/usr/include/smbios -%if %{build_xml} +%{_libdir}/libsmbios.so.1 %{_libdir}/libsmbiosxml.so -%endif +%{_libdir}/libsmbiosxml.so.1 +/usr/include/smbios %files bin %defattr(555,root,root) @@ -223,10 +221,11 @@ ldconfig %{_bindir}/verifySmiPassword %{_bindir}/wakeupCtl %{_bindir}/dellLcdBrightness +%{_bindir}/dellWirelessCtl %files unsupported-bin %defattr(555,root,root) -%doc COPYING-GPL COPYING-OSL README +%doc COPYING-GPL COPYING-OSL README include/smbios/config/boost_LICENSE_1_0_txt bins/getopts_LICENSE.txt %{_bindir}/activateCmosToken %{_bindir}/ascii2enUS_scancode %{_bindir}/createUnitTestFiles @@ -238,7 +237,6 @@ ldconfig %{_bindir}/smitest %{_bindir}/stateByteCtl %{_bindir}/upBootCtl -%{_bindir}/sysid %if %{build_xml} %files -n libsmbiosxml-bin @@ -253,6 +251,11 @@ ldconfig %endif %changelog +* Mon Mar 26 2007 - dkukawka@suse.de +- updated to new version 0.13.4 as requested by DELL maintainer + - autotools conversion + - new util dellWirelessCtl to control builtin wireless on Dell + laptops * Sun Mar 04 2007 - dkukawka@suse.de - fixed spec file: removed 'rm -rf ${RPM_BUILD_ROOT}' from install section