Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at Mon Nov 29 17:11:09 CET 2010. -------- --- open-vm-tools/open-vm-tools.changes 2010-06-07 11:36:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/open-vm-tools/open-vm-tools.changes 2010-11-25 15:09:21.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Nov 22 11:51:35 UTC 2010 - dimstar@opensuse.org + +- Update to version 2010-11-17: + + Mostly cleanups and bug fixes. + + vmxnet3 on Solaris now supports jumbo frames. +- For all older updates, please see NEWS. +- Add an easy way to enable/disable X tools. Those currently fail + to build. +- Drop open-vm-tools-libpng14.patch: upstream fixed. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- open-vm-tools-2010.03.20-243334.tar.bz2 open-vm-tools-libpng14.patch New: ---- open-vm-tools-2010.11.17-327185.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.3wdrFP/_old 2010-11-29 13:29:41.000000000 +0100 +++ /var/tmp/diff_new_pack.3wdrFP/_new 2010-11-29 13:29:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package open-vm-tools (Version 2010.03.20) +# spec file for package open-vm-tools (Version 2010.11.17) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (C) 2010 Dominique Leuenberger, Amsterdam, Netherlands. @@ -22,20 +22,23 @@ %define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000' # Modules that have to be build up to version 11.3 -%if 0%{suse_version} <= 1130 -%define mod1130 vmblock vmhgfs vmsync vmxnet vmci vsock +%if 0%{suse_version} <= 1140 +%define mod1140 vmblock vmhgfs vmsync vmxnet vmci vsock %endif -# Modules that are needed up to openSUSE 11.2 (kernel in 11.3 includes them). The previous list is expanded by this. +# Modules that are needed up to openSUSE 11.2 (kernel in 11.3 includes them). The previous list is extended by this. %if 0%{suse_version} <= 1120 %define mod1120 pvscsi vmmemctl vmxnet3 %endif +# X modules are failing all the time the build currently. We need an easy way to enable/disable them. +%define with_X 0 + Name: open-vm-tools Group: System/Emulators/PC Summary: Open Virtual Machine Tools -Version: 2010.03.20 -Release: 3 -%define svn_rev 243334 +Version: 2010.11.17 +Release: 1 +%define svn_rev 327185 Url: http://open-vm-tools.sourceforge.net/ License: BSD3c ; GPLv2 ; LGPLv2.1 Source: %{name}-%{version}-%{svn_rev}.tar.bz2 @@ -52,8 +55,6 @@ # vmmemctl.tar.bz2 is extracted from open-vm-tools 2010.02.23 Source8: vmmemctl.tar.bz2 Source98: preamble -# PATCH-FIX-UPSTREAM open-vm-tools-libpng14.patch sf#2983141 dimstar@opensuse.org -- Fix build with libpng 1.4 -Patch0: open-vm-tools-libpng14.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: kernel-source @@ -78,7 +79,7 @@ Requires: vmware-guest-kmp Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*) -%define vm_modules %{?mod1130} %{?mod1120} +%define vm_modules %{?mod1140} %{?mod1130} %{?mod1120} %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um @@ -135,6 +136,8 @@ * General mechanisms and protocols for communication between host and guests and from guest to guest +%if %with_X + %package gui License: BSD3c ; GPLv2 ; LGPLv2.1 Summary: Open Virtual Machine Tools - GUI @@ -144,6 +147,7 @@ %description gui GUI Toolbox for Open Virtual Machine Tools +%endif %package -n libvmtools0 License: BSD3c ; GPLv2 ; LGPLv2.1 @@ -170,12 +174,14 @@ tar xvf %{S:7} tar xvf %{S:8} popd -%patch0 -p1 chmod -x AUTHORS COPYING ChangeLog NEWS README # fix for an rpmlint warning regarding wrong line feeds sed -i -e "s/\r//" README %build +# Bool is not char, but bool... +#sed -i "s/typedef.*char.*Bool/typedef int Bool/" lib/include/vm_basic_types.h + # comments in a continued line seem not to work... shame # --disable-unity : liburiparser was not present before 11.0 %configure \ @@ -185,6 +191,11 @@ --without-kernel-modules \ --without-root-privileges \ --without-procps \ +%if %with_X + --with-x \ +%else + --without-x \ +%endif --disable-dependency-tracking \ --disable-static make @@ -224,43 +235,48 @@ %makeinstall # Clean up the *.la files make install put all around find %{buildroot} -name '*.la' -delete -print -rm %{buildroot}%{_datadir}/applications/vmware-user.desktop # install the vmtoolsd init script and also it's rcvmtoolsd softlink install -D -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/vmtoolsd ln -sf ../../etc/init.d/vmtoolsd $RPM_BUILD_ROOT%{_sbindir}/rcvmtoolsd +%if %with_X # vmware-user is started by vmware-user-suid-wrapper by xdg-autostart # unfortunately, vmware-user-suid-wrapper does not wait for it's block device # to appear. For this reason we have now a vmware-user-autostart-wrapper # which checks for /proc/fs/vmblock/dev to appear and then starts vmware-user-suid-wrapper install -D -m 0755 %{S:5} $RPM_BUILD_ROOT%{_bindir}/vmware-user-autostart-wrapper install -D -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop -install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf # handle the .destop files for translations %suse_update_desktop_file vmware-user-autostart +%endif + +# modprobe configuration for vmnics. +install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf # fix a link pointing to the buildroot for mount.vmhgfs ( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs ) # the script installs some binaries into /usr/share/open-vm-tools which are just some tests. # So we drop them for the moment. Upstream has been informed about this. -rm -rf %{buildroot}%{_datadir}/%{name} +rm -r %{buildroot}%{_datadir}/%{name} %post %run_permissions /sbin/ldconfig %{fillup_and_insserv -Y vmtoolsd} +%if %with_X %verifyscript gui %verify_permissions %post gui %run_permissions +%endif %preun -# stop service with the old name (if exists) on update (something like %stop_on_update) +# stop service with the old name (if exists) on update (something like %%stop_on_update) test -n "$FIRST_ARG" || FIRST_ARG=$1 if test "$FIRST_ARG" -ge 1 ; then test -f /etc/sysconfig/services && . /etc/sysconfig/services @@ -290,7 +306,9 @@ %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/plugins/common %dir %{_libdir}/%{name}/plugins/vmsvc +%if %with_X %dir %{_libdir}/%{name}/plugins/vmusr +%endif %{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so %{_libdir}/%{name}/plugins/vmsvc/libpowerOps.so %{_libdir}/%{name}/plugins/vmsvc/libtimeSync.so @@ -311,20 +329,24 @@ %{_sbindir}/rcvmtoolsd %exclude %{_libdir}/*.so +%if %with_X + %files gui %defattr(-, root, root) %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop %{_bindir}/vmware-toolbox %{_bindir}/vmware-user %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper -%{_bindir}/vmware-user-autostart-wrapper %{_libdir}/%{name}/plugins/vmusr/libresolutionSet.so %{_libdir}/%{name}/plugins/vmusr/libvixUser.so +%{_bindir}/vmware-user-autostart-wrapper +%endif %files -n libvmtools0 %defattr(-, root, root) %{_libdir}/libvmtools.so.* %{_libdir}/libguestlib.so.* +%{_libdir}/libhgfs.so.* %files -n libvmtools-devel %defattr(-,root,root) ++++++ open-vm-tools-2010.03.20-243334.tar.bz2 -> open-vm-tools-2010.11.17-327185.tar.bz2 ++++++ ++++ 381074 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org