Accepting request 541225 from home:jmoellers:branches:Base:System

OBS-URL: https://build.opensuse.org/request/show/541225
OBS-URL: https://build.opensuse.org/package/show/Base:System/libsmbios?expand=0&rev=32
This commit is contained in:
Dirk Mueller 2017-11-21 09:41:57 +00:00 committed by Git OBS Bridge
parent 447c87b5c2
commit c1e5a7938f
2 changed files with 10 additions and 42 deletions

View File

@ -4,6 +4,11 @@ Fri Nov 3 05:06:47 UTC 2017 - bwiedemann@suse.com
- Do not store build logs in the package to make the
package build result reproducible
-------------------------------------------------------------------
Mon Oct 30 11:33:14 UTC 2017 - josef.moellers@suse.com
- Deleted unnecessary sections from SPEC file.
-------------------------------------------------------------------
Fri Sep 22 13:09:57 UTC 2017 - josef.moellers@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libsmbios
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -53,44 +53,10 @@
%define ctypes_BR python-ctypes
%define fdupes_BR hardlink
%define valgrind_BR valgrind
# 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
# suse/sles
%if 0%{?suse_version}
%if 0%{?suse_version} < 1000
%define valgrind_BR %{nil}
# sles 9 doesnt have as_needed
%undefine as_needed
%endif
%if 0%{?suse_version} >= 1020
# suse never added python-ctypes provides to python 2.5 :(
%define ctypes_BR %{nil}
%endif
%if 0%{?suse_version} > 1020
%define fdupes_BR fdupes
%else
%define fdupes_BR %{nil}
%define fdupes echo fdupes disabled
%endif
%endif
# rhel (should work on OBS and EPEL)
%if 0%{?rhel}
%if 0%{?rhel} < 5
%define fdupes echo fdupes disabled
%define fdupes_BR %{nil}
%endif
%if 0%{?rhel} < 4
# dont yet have rhel3 valgrind
%define valgrind_BR %{nil}
# no python-ctypes for python <= 2.2
%undefine build_python
# rhel3 doesnt have -as-needed
%undefine as_needed
%endif
%endif
# suse never added python-ctypes provides to python 2.5 :(
%define ctypes_BR %{nil}
%define fdupes_BR fdupes
%define python_devel_BR %{nil}
%if 0%{?build_python}
@ -207,8 +173,8 @@ programs against libsmbios.
%package -n yum-dellsysid
Summary: YUM plugin to retrieve the Dell System ID
# yum plugin and supporting functions first appeared in 2.2.0
Group: Development/Tools
# yum plugin and supporting functions first appeared in 2.2.0
Requires: smbios-utils-python >= 2.2.0
%description -n yum-dellsysid
@ -225,7 +191,6 @@ substitutions in yum repository configuration files on Dell systems.
: '#'
: '# build_python: %{?build_python}'
: '# run_unit_tests: %{?run_unit_tests}'
: '# rhel: %{?rhel}'
: '# suse_version: %{?suse_version}'
: '#'
: '########################################'
@ -356,11 +321,9 @@ cat > files-yum-dellsysid <<-EOF
%{_exec_prefix}/lib/yum-plugins/*
# SUSE build has anal directory ownership check. RPM which owns all dirs *must*
# be installed at buildtime.
%if 0%{?suse_version} >= 1100
%dir %{_sysconfdir}/yum
%dir %{_sysconfdir}/yum/pluginconf.d/
%dir %{_exec_prefix}/lib/yum-plugins/
%endif
EOF
%endif