pool/open-vm-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 629473 from home:kallan:branches:Virtualization:VMware

Browse Source 
- After updating the project to include openSUSE_Leap_15.0 and SLE_15, the
  builds for these two projects fail because of unresolved dependencies.
  Some Factory configuration settings were being used for them.  Need to adjust
  the spec file to not use Factory configuration settings for
  openSUSE_Leap_15.0 and SLE_15.

OBS-URL: https://build.opensuse.org/request/show/629473
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=360
This commit is contained in:
Kirk Allan 2018-08-15 22:01:35 +00:00 committed by Git OBS Bridge
parent 75f6e99adf
commit 8f0a3da964
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
open-vm-tools.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Aug 15 18:07:49 UTC 2018 - kallan@suse.com
- After updating the project to include openSUSE_Leap_15.0 and SLE_15, the
builds for these two projects fail because of unresolved dependencies.
Some Factory configuration settings were being used for them. Need to adjust
the spec file to not use Factory configuration settings for
openSUSE_Leap_15.0 and SLE_15.
-------------------------------------------------------------------
Fri Aug 10 16:23:27 UTC 2018 - kallan@suse.com

8
open-vm-tools.spec
View File

@ -97,7 +97,7 @@ BuildRequires: pam-devel
BuildRequires: pcre-devel
BuildRequires: procps-devel
BuildRequires: update-desktop-files
%if 0%{?suse_version} >= 1330
%if 0%{?suse_version} > 1500
BuildRequires: glibc >= 2.27
BuildRequires: libtirpc-devel
BuildRequires: rpcgen
@ -116,7 +116,7 @@ BuildRequires: xorg-x11-devel
%if %{with vgauth}
# vgauth requires xml2, xerces-c, and xml-security-c
BuildRequires: libxml2-devel
%if 0%{?suse_version } > 1320 || ( 0%{?is_opensuse} && 0%{?sle_version} >= 0120100 )
%if 0%{?suse_version } > 1500 || ( 0%{?is_opensuse} && 0%{?sle_version} >= 0120100 )
# Use xmlsec1 instead of xml-security-c where available.
BuildRequires: pkgconfig(xmlsec1)
%else
@ -136,7 +136,7 @@ Requires: libvmtools0 = %{version}-%{release}
Requires: net-tools
Requires: tar
Requires: which
%if 0%{?suse_version } > 1320 || ( 0%{?is_opensuse} && 0%{?sle_version} >= 0120100 )
%if 0%{?suse_version } > 1500 || ( 0%{?is_opensuse} && 0%{?sle_version} >= 0120100 )
Requires: libxmlsec1-openssl1
%endif
# open-vm-tools >= 10.0.0 do not require open-vm-tools-deploypkg
@ -233,7 +233,7 @@ sed -i -e "s/\r//" README
# (this is because of 'g_static_mutex_init' usage which is now deprecated)
export CFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-sizeof-pointer-memaccess -Wno-cpp -fPIE"
export CXXFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-sizeof-pointer-memaccess -Wno-cpp -fPIE"
%if 0%{?suse_version} >= 1330
%if 0%{?suse_version} > 1500
export LDFLAGS="-pie -ltirpc"
%else
export LDFLAGS="-pie"