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

Accepting request 340488 from home:mlatimer:branches:Virtualization:VMware

Browse Source 
- Remove vgauth requirements from vmtoolsd.service file if vgauth
  is not enabled.
- Remove gcc4.7 requirement for older environments.

OBS-URL: https://build.opensuse.org/request/show/340488
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=318
This commit is contained in:
Mike Latimer 2015-10-22 19:20:48 +00:00 committed by Git OBS Bridge
parent c31e7c0ee2
commit 55d85af380
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
open-vm-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Oct 22 16:34:51 UTC 2015 - mlatimer@suse.com
- Remove vgauth requirements from vmtoolsd.service file if vgauth
is not enabled.
- Remove gcc4.7 requirement for older environments.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 9 16:43:54 UTC 2015 - mlatimer@suse.com Wed Sep 9 16:43:54 UTC 2015 - mlatimer@suse.com

14
open-vm-tools.spec
View File

@ -82,13 +82,7 @@ Source7: tools.conf
Source8: vgauthd.service Source8: vgauthd.service
Source98: preamble Source98: preamble
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# SUSE versions below 1110 (SLES11 SP4) must use gcc 4.7 to compile under i586
%if 0%{?suse_version} <= 1110
BuildRequires: gcc47
BuildRequires: gcc47-c++
%else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif
# don't use pkgconfig(gtk+-2.0) so we can build on SLE # don't use pkgconfig(gtk+-2.0) so we can build on SLE
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: gtkmm2-devel BuildRequires: gtkmm2-devel
@ -255,9 +249,6 @@ export CXXFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-vari
%else %else
export CFLAGS="%{optflags} -Wno-deprecated-declarations -fPIE" export CFLAGS="%{optflags} -Wno-deprecated-declarations -fPIE"
export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -fPIE" export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -fPIE"
# SUSE versions below 1110 (SLES11 SP4) must use gcc 4.7 to compile under i586
export CC=gcc-4.7
export CXX=g++-4.7
%endif %endif
export LDFLAGS="-pie" export LDFLAGS="-pie"
# Required for version 9.4.0 # Required for version 9.4.0
@ -297,7 +288,7 @@ cd ..
mkdir -p obj mkdir -p obj
for flavor in %{flavors_to_build}; do for flavor in %{flavors_to_build}; do
rm -rf obj/$flavor rm -rf obj/$flavor
cp -r %{tarname}-%{version}-%{svn_rev} obj/$flavor cp -r %{tarname} obj/$flavor
pushd obj/$flavor pushd obj/$flavor
for module in %{vm_modules}; do for module in %{vm_modules}; do
pushd modules/linux/$module pushd modules/linux/$module
@ -358,6 +349,9 @@ ln -sf service %{buildroot}%{_sbindir}/rcvmtoolsd
%if %{with vgauth} %if %{with vgauth}
install -p -m 644 -D %{SOURCE8} %{buildroot}%{_unitdir}/vgauthd.service install -p -m 644 -D %{SOURCE8} %{buildroot}%{_unitdir}/vgauthd.service
ln -sf service %{buildroot}%{_sbindir}/rcvgauthd ln -sf service %{buildroot}%{_sbindir}/rcvgauthd
%else
# if vgauth is not enabled, it must be removed from vmtoolsd.service
sed -i '/vgauth/d' %{buildroot}%{_unitdir}/vmtoolsd.service
%endif %endif
%else %else
install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/vmtoolsd install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/vmtoolsd