| |
@@ -5,11 +5,11 @@
|
| |
# these are all substituted by autoconf
|
| |
%define major 2
|
| |
%define minor 3
|
| |
- %define micro 0
|
| |
+ %define micro 3
|
| |
%define extra %{nil}
|
| |
%define pot_file libsmbios
|
| |
%define lang_dom libsmbios-2.3-x86_64
|
| |
- %define release_version 2.3.0
|
| |
+ %define release_version 2.3.3
|
| |
|
| |
%define release_name libsmbios
|
| |
%define other_name libsmbios2
|
| |
@@ -42,9 +42,12 @@
|
| |
# Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
|
| |
# SUSE: fedora_version suse_version rhel_version centos_version sles_version
|
| |
# Fedora: fedora dist fc8 fc9
|
| |
+ %global autotools_BR autoconf gettext-devel automake libtool
|
| |
|
| |
# suse/sles
|
| |
%if 0%{?suse_version}
|
| |
+ # not sure about package names for autotools
|
| |
+ %global autotools_BR %{nil}
|
| |
%if 0%{?suse_version} < 1000
|
| |
%global valgrind_BR %{nil}
|
| |
# sles 9 doesnt have as_needed
|
| |
@@ -62,6 +65,19 @@
|
| |
%endif
|
| |
%endif
|
| |
|
| |
+ # let introduce fedora exceptions
|
| |
+ %if 0%{?fedora}
|
| |
+ %if 0%{?fedora} > 26
|
| |
+ # we need autotools
|
| |
+ %global autotools_BR autoconf gettext-devel automake libtool
|
| |
+ # python-ctypes in f27 in python
|
| |
+ %global ctypes_BR %{nil}
|
| |
+ # something new in f27
|
| |
+ %undefine _debugsource_packages
|
| |
+ %undefine _debuginfo_subpackages
|
| |
+ %endif
|
| |
+ %endif
|
| |
+
|
| |
# rhel (should work on OBS and EPEL)
|
| |
%if 0%{?rhel}
|
| |
%if 0%{?rhel} < 5
|
| |
@@ -99,15 +115,16 @@
|
| |
|
| |
Name: %{release_name}
|
| |
Version: %{release_version}
|
| |
- Release: 6%{?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
|
| |
- Patch0001: 0001-Don-t-force-the-compiler-version-check-on-consumers-.patch
|
| |
- URL: http://linux.dell.com/libsmbios/main
|
| |
+ # Source: https://codeload.github.com/dell/%{name}/tar.gz/v%{version}#%{name}-%{version}.tar.gz
|
| |
+ Source: %{name}-%{version}.tar.gz
|
| |
+ # Patch0001: 0001-Don-t-force-the-compiler-version-check-on-consumers-.patch
|
| |
+ URL: https://github.com/dell/libsmbios
|
| |
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
| |
- BuildRequires: strace libxml2-devel gcc-c++ gettext git doxygen %{valgrind_BR} %{cppunit_BR} %{fdupes_BR} %{pkgconfig_BR} %{python_devel_BR}
|
| |
+ BuildRequires: strace libxml2-devel gcc-c++ gettext git doxygen %{valgrind_BR} %{cppunit_BR} %{fdupes_BR} %{pkgconfig_BR} %{python_devel_BR} %{autotools_BR}
|
| |
# uncomment for official fedora
|
| |
Obsoletes: libsmbios-libs < 2.0.0
|
| |
Provides: libsmbios-libs = 0:%{version}-%{release}
|
| |
@@ -309,17 +326,17 @@
|
| |
ln -s smbios-sys-info %{buildroot}/%{_sbindir}/getSystemId
|
| |
ln -s smbios-wireless-ctl %{buildroot}/%{_sbindir}/dellWirelessCtl
|
| |
ln -s smbios-lcd-brightness %{buildroot}/%{_sbindir}/dellLcdBrightness
|
| |
- ln -s smbios-rbu-bios-update %{buildroot}/%{_sbindir}/dellBiosUpdate
|
| |
+ # ln -s smbios-rbu-bios-update %{buildroot}/%{_sbindir}/dellBiosUpdate
|
| |
|
| |
cat > files-python-smbios <<-EOF
|
| |
- %doc COPYING-GPL COPYING-OSL README
|
| |
+ %doc COPYING-GPL COPYING-OSL README.md
|
| |
%{python_sitelib}/*
|
| |
EOF
|
| |
|
| |
cat > files-smbios-utils-python <<-EOF
|
| |
- %doc COPYING-GPL COPYING-OSL README
|
| |
+ %doc COPYING-GPL COPYING-OSL README.md
|
| |
%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
|
| |
- %doc doc/pkgheader.sh
|
| |
+ # %doc doc/pkgheader.sh
|
| |
%dir %{_sysconfdir}/libsmbios
|
| |
%config(noreplace) %{_sysconfdir}/libsmbios/*
|
| |
|
| |
@@ -329,16 +346,17 @@
|
| |
%{_sbindir}/smbios-passwd
|
| |
%{_sbindir}/smbios-wakeup-ctl
|
| |
%{_sbindir}/smbios-wireless-ctl
|
| |
- %{_sbindir}/smbios-rbu-bios-update
|
| |
+ # %%{_sbindir}/smbios-rbu-bios-update
|
| |
%{_sbindir}/smbios-lcd-brightness
|
| |
%{_sbindir}/smbios-keyboard-ctl
|
| |
%{_sbindir}/smbios-thermal-ctl
|
| |
+ %{_sbindir}/smbios-battery-ctl
|
| |
|
| |
# symlinks: backwards compat
|
| |
%{_sbindir}/dellLcdBrightness
|
| |
%{_sbindir}/getSystemId
|
| |
%{_sbindir}/dellWirelessCtl
|
| |
- %{_sbindir}/dellBiosUpdate
|
| |
+ # %%{_sbindir}/dellBiosUpdate
|
| |
# used by HAL in old location, so keep it around until HAL is updated.
|
| |
%{_bindir}/dellWirelessCtl
|
| |
|
| |
@@ -347,7 +365,7 @@
|
| |
EOF
|
| |
|
| |
cat > files-yum-dellsysid <<-EOF
|
| |
- %doc COPYING-GPL COPYING-OSL README
|
| |
+ %doc COPYING-GPL COPYING-OSL README.md
|
| |
# YUM Plugin
|
| |
%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/*
|
| |
%{_exec_prefix}/lib/yum-plugins/*
|
| |
@@ -373,14 +391,13 @@
|
| |
%files -f _build/%{lang_dom}.lang
|
| |
%defattr(-,root,root,-)
|
| |
%{_libdir}/libsmbios_c.so.*
|
| |
- %{_libdir}/libsmbios.so.*
|
| |
|
| |
%files -n libsmbios-devel -f _build/buildlogs.txt
|
| |
%defattr(-,root,root,-)
|
| |
- %doc COPYING-GPL COPYING-OSL README src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
|
| |
+ %doc COPYING-GPL COPYING-OSL README.md src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
|
| |
%{_includedir}/smbios
|
| |
%{_includedir}/smbios_c
|
| |
- %{_libdir}/libsmbios.so
|
| |
+ # %%{_libdir}/libsmbios.so
|
| |
%{_libdir}/libsmbios_c.so
|
| |
%{_libdir}/pkgconfig/*.pc
|
| |
%doc _build/out/libsmbios_c++-%{_arch}
|
| |
@@ -389,21 +406,21 @@
|
| |
%files -n smbios-utils
|
| |
# opensuse 11.1 enforces non-empty file list :(
|
| |
%defattr(-,root,root,-)
|
| |
- %doc COPYING-GPL COPYING-OSL README
|
| |
+ %doc COPYING-GPL COPYING-OSL README.md
|
| |
# no other files.
|
| |
|
| |
%files -n smbios-utils-bin
|
| |
%defattr(-,root,root,-)
|
| |
- %doc COPYING-GPL COPYING-OSL README
|
| |
+ %doc COPYING-GPL COPYING-OSL README.md
|
| |
%doc src/bin/getopts_LICENSE.txt src/include/smbios/config/boost_LICENSE_1_0_txt
|
| |
- %doc doc/pkgheader.sh
|
| |
+ # %doc doc/pkgheader.sh
|
| |
#
|
| |
# legacy C++
|
| |
- %{_sbindir}/dellBiosUpdate-compat
|
| |
- %{_sbindir}/dellLEDCtl
|
| |
- %ifnarch ia64
|
| |
- %{_sbindir}/dellMediaDirectCtl
|
| |
- %endif
|
| |
+ # %%{_sbindir}/dellBiosUpdate-compat
|
| |
+ # %%{_sbindir}/dellLEDCtl
|
| |
+ #%%ifnarch ia64
|
| |
+ #%%{_sbindir}/dellMediaDirectCtl
|
| |
+ #%%endif
|
| |
#
|
| |
# new C utilities
|
| |
%{_sbindir}/smbios-state-byte-ctl
|
| |
@@ -423,6 +440,11 @@
|
| |
%defattr(-,root,root,-)
|
| |
|
| |
%changelog
|
| |
+ * Tue Oct 31 2017 Jiri Kastner <jkastner@fedoraproject.org> - 2.3.3-1
|
| |
+ - fixed dependency on python-ctypes
|
| |
+ - fixed buildeps for fedora
|
| |
+ - rebase to 2.3.3
|
| |
+
|
| |
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-6
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
| |
|
| |
jkastner
commented 5 years ago
fixed buildeps for fedora
rebase to 2.3.3