diff --git a/open-vm-tools.changes b/open-vm-tools.changes index d8b0ac9..8db08e4 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -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 diff --git a/open-vm-tools.spec b/open-vm-tools.spec index cc38e14..5f155d3 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -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"