- Fix for compiling with recent gcc (from Danny Kukawa @ suse)

- fix for lsb issues - moved binaries to /usr/sbin/ because they require
    admin privs to run. Made one backwards-compat symlink to work with
    existing HAL which expects current location.
This commit is contained in:
Michael E Brown 2007-11-26 23:30:11 +00:00
parent 721938697d
commit 30c67332ae
3 changed files with 42 additions and 29 deletions

View File

@ -1 +1 @@
libsmbios-0.13.10.tar.gz libsmbios-0.13.13.tar.gz

View File

@ -1,7 +1,7 @@
# these are all substituted by autoconf # these are all substituted by autoconf
%define major 0 %define major 0
%define minor 13 %define minor 13
%define sub 10 %define sub 13
%define extralevel %{nil} %define extralevel %{nil}
%define release_name libsmbios %define release_name libsmbios
%define release_version %{major}.%{minor}.%{sub}%{extralevel} %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@ -43,6 +43,7 @@ to get information from standard BIOS tables, such as the SMBIOS table.
Summary: Libsmbios shared libraries Summary: Libsmbios shared libraries
Group: System Environment/Libraries Group: System Environment/Libraries
Obsoletes: libsmbiosxml-libs < 0:%{version}-%{release} Obsoletes: libsmbiosxml-libs < 0:%{version}-%{release}
Obsoletes: libsmbios < 0:%{version}-%{release}
Provides: libsmbiosxml-libs = %{version}-%{release} Provides: libsmbiosxml-libs = %{version}-%{release}
@ -52,6 +53,7 @@ Group: Applications/System
Requires: libsmbios-libs = %{version}-%{release} Requires: libsmbios-libs = %{version}-%{release}
Obsoletes: libsmbiosxml-bin < 0:%{version}-%{release} Obsoletes: libsmbiosxml-bin < 0:%{version}-%{release}
Provides: libsmbiosxml-bin = %{version}-%{release} Provides: libsmbiosxml-bin = %{version}-%{release}
Obsoletes: smbios-utils < 0:%{version}-%{release}
%package unsupported-bin %package unsupported-bin
Summary: Unsupported sample binaries using libsmbios Summary: Unsupported sample binaries using libsmbios
@ -107,10 +109,16 @@ make -e %{?_smp_mflags}
%install %install
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
mkdir -p %{buildroot}/usr/include mkdir -p %{buildroot}/usr/include
cp -a include/smbios %{buildroot}/usr/include/ cp -a include/smbios %{buildroot}/usr/include/
rm -f %{buildroot}/%{_libdir}/lib*.la 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 %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -132,47 +140,52 @@ rm -rf %{buildroot}
%{_libdir}/libsmbios.so %{_libdir}/libsmbios.so
%{_libdir}/libsmbiosxml.a %{_libdir}/libsmbiosxml.a
%{_libdir}/libsmbiosxml.so %{_libdir}/libsmbiosxml.so
%doc doc/full/html
%files bin %files bin
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING-GPL COPYING-OSL README bin-unsupported/getopts_LICENSE.txt %doc COPYING-GPL COPYING-OSL README bin-unsupported/getopts_LICENSE.txt
%{_bindir}/assetTag %{_sbindir}/assetTag
%{_bindir}/dellBiosUpdate %{_sbindir}/dellBiosUpdate
%{_bindir}/getSystemId %{_sbindir}/getSystemId
%{_bindir}/propertyTag %{_sbindir}/propertyTag
%{_bindir}/serviceTag %{_sbindir}/serviceTag
%{_bindir}/tokenCtl %{_sbindir}/tokenCtl
%{_bindir}/verifySmiPassword %{_sbindir}/verifySmiPassword
%{_bindir}/wakeupCtl %{_sbindir}/wakeupCtl
%{_bindir}/dellLcdBrightness %{_sbindir}/dellLcdBrightness
%{_sbindir}/dellWirelessCtl
%{_bindir}/dellWirelessCtl %{_bindir}/dellWirelessCtl
%files unsupported-bin %files unsupported-bin
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING-GPL COPYING-OSL README include/smbios/config/boost_LICENSE_1_0_txt bin-unsupported/getopts_LICENSE.txt %doc COPYING-GPL COPYING-OSL README include/smbios/config/boost_LICENSE_1_0_txt bin-unsupported/getopts_LICENSE.txt
%{_bindir}/dellLEDCtl %{_sbindir}/dellLEDCtl
%{_bindir}/activateCmosToken %{_sbindir}/activateCmosToken
%{_bindir}/ascii2enUS_scancode %{_sbindir}/ascii2enUS_scancode
%{_bindir}/createUnitTestFiles %{_sbindir}/createUnitTestFiles
%{_bindir}/disable_console_redir %{_sbindir}/disable_console_redir
%{_bindir}/dumpCmos %{_sbindir}/dumpCmos
%{_bindir}/getPasswordFormat %{_sbindir}/getPasswordFormat
%{_bindir}/isCmosTokenActive %{_sbindir}/isCmosTokenActive
%{_bindir}/probes %{_sbindir}/probes
%{_bindir}/smitest %{_sbindir}/smitest
%{_bindir}/stateByteCtl %{_sbindir}/stateByteCtl
%{_bindir}/upBootCtl %{_sbindir}/upBootCtl
%{_bindir}/dumpSmbios %{_sbindir}/dumpSmbios
#%{_bindir}/sysid
# ./ChangeLog is appended by configure # ./ChangeLog is appended by configure
%changelog %changelog
* Mon Nov 26 2007 Michael Brown <mebrown@michaels-house.net> - 0.13.13-1
- Fix for compiling with recent gcc (from Danny Kukawa @ suse)
- fix for lsb issues - moved binaries to /usr/sbin/ because they require admin
privs to run. Made one backwards-compat symlink to work with existing HAL
which expects current location.
* Mon Aug 28 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.10-1 * Mon Aug 28 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.10-1
- Fix one instance where return code to fread was incorrectly checked. - Fix one instance where return code to fread was incorrectly checked.
* Wed Aug 22 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.9 * Wed Aug 22 2007 Michael E Brown <michael_e_brown at dell.com> - 0.13.9
- Fix a couple of failure-to-check-return on fread. most were unit-test code - Fix a couple of failure-to-check-return on fopen. most were unit-test code
only, but two or three were in regular code. only, but two or three were in regular code.
- Add hinting to the memory class, so that it can intelligently close /dev/mem - Add hinting to the memory class, so that it can intelligently close /dev/mem
file handle when it is not needed (which is most of the time). it only file handle when it is not needed (which is most of the time). it only

View File

@ -1 +1 @@
23faf207803e7249be7662697f8218a9 libsmbios-0.13.10.tar.gz 38ac169cfe866a8472e76df5c184a8ca libsmbios-0.13.13.tar.gz