Author: denis Update of /cvs/free/rpms/open-vm-tools/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv13498 Modified Files: .cvsignore open-vm-tools-guestd.init open-vm-tools.spec sources Added Files: open-vm-tools-172495-pluginpath.patch Log Message: - Update to upstream build 172495 - Split libs subpackage for multilib friendliness - Added pam-devel BR - Switch to vmtoolsd for vmsvc, updated init file - Added patch to fix default vmtoolsd plugin path open-vm-tools-172495-pluginpath.patch: --- NEW FILE open-vm-tools-172495-pluginpath.patch --- --- open-vm-tools-2009.06.18-172495/services/vmtoolsd/Makefile.in~ 2009-06-18 09:03:40.000000000 +0200 +++ open-vm-tools-2009.06.18-172495/services/vmtoolsd/Makefile.in 2009-06-30 12:19:16.985865101 +0200 @@ -278,7 +278,7 @@ pamdir = $(PAM_PREFIX)/pam.d vmtoolsd_CPPFLAGS = @VMTOOLS_CPPFLAGS@ @GMODULE_CPPFLAGS@ \ @GOBJECT_CPPFLAGS@ @GTHREAD_CPPFLAGS@ -I$(builddir) \ - -DVMTOOLSD_PLUGIN_ROOT=\"$(pkglibdir)\" + -DVMTOOLSD_PLUGIN_ROOT=\"$(sysconfdir)/vmware-tools/plugins\" vmtoolsd_LDADD = @VMTOOLS_LIBS@ @GMODULE_LIBS@ @GOBJECT_LIBS@ \ @GTHREAD_LIBS@ $(am__append_1) vmtoolsd_SOURCES = cmdLine.c mainLoop.c mainPosix.c pluginMgr.c \ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/open-vm-tools/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Mar 2009 10:48:03 -0000 1.6 +++ .cvsignore 30 Jun 2009 10:46:21 -0000 1.7 @@ -1 +1 @@ -open-vm-tools-2009.03.18-154848.tar.gz +open-vm-tools-2009.06.18-172495.tar.gz Index: open-vm-tools-guestd.init =================================================================== RCS file: /cvs/free/rpms/open-vm-tools/devel/open-vm-tools-guestd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- open-vm-tools-guestd.init 10 Nov 2008 20:59:46 -0000 1.1 +++ open-vm-tools-guestd.init 30 Jun 2009 10:46:21 -0000 1.2 @@ -1,23 +1,23 @@ #!/bin/bash # -# Init file for open-vm-tools vmware-guestd daemon +# Init file for open-vm-tools vmtoolsd daemon # # chkconfig: 345 80 20 # description: open-vm-tools guest daemon # -# processname: vmware-guestd -# pidfile: /var/run/vmware-guestd.pid +# processname: vmtoolsd +# pidfile: /var/run/vmtoolsd.pid # source function library . /etc/rc.d/init.d/functions RETVAL=0 -prog="vmware-guestd" +prog="vmtoolsd" -GUESTD=/usr/sbin/vmware-guestd -PID_FILE=/var/run/vmware-guestd.pid -LOCK_FILE=/var/lock/subsys/vmware-guestd -OPTIONS="--background $PID_FILE" +GUESTD=/usr/bin/vmtoolsd +PID_FILE=/var/run/vmtoolsd.pid +LOCK_FILE=/var/lock/subsys/vmtoolsd +OPTIONS="-b $PID_FILE" DND_DIR="/tmp/VMwareDnD" setup_modules() @@ -42,7 +42,7 @@ start() { - echo -n $"Starting $prog: " + echo -n $"Starting Open-vm-tools guest daemon: " setup_modules $GUESTD $OPTIONS && success || failure RETVAL=$? @@ -52,8 +52,8 @@ stop() { - echo -n $"Stopping $prog: " - killall vmware-user + echo -n $"Stopping Open-vm-tools guest daemon: " + killall vmware-user 2>/dev/null unmount_stuff killproc $GUESTD RETVAL=$? Index: open-vm-tools.spec =================================================================== RCS file: /cvs/free/rpms/open-vm-tools/devel/open-vm-tools.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- open-vm-tools.spec 3 Apr 2009 21:57:33 -0000 1.8 +++ open-vm-tools.spec 30 Jun 2009 10:46:21 -0000 1.9 @@ -1,9 +1,9 @@ -%define builddate 2009.03.18 -%define buildver 154848 +%define builddate 2009.06.18 +%define buildver 172495 Name: open-vm-tools Version: 0.0.0.%{buildver} -Release: 3%{?dist} +Release: 1%{?dist} Summary: VMware Guest OS Tools Group: Applications/System License: LGPLv2 @@ -13,6 +13,7 @@ Source2: %{name}-sysconfig.mouse Source3: vmware-toolbox.desktop Source4: %{name}-modprobe.vmnics +Patch0: open-vm-tools-172495-pluginpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i586 x86_64 @@ -21,6 +22,7 @@ BuildRequires: gtkmm24-devel BuildRequires: libXtst-devel BuildRequires: libdnet-devel +BuildRequires: pam-devel BuildRequires: procps BuildRequires: libdnet-devel BuildRequires: libicu-devel @@ -28,6 +30,7 @@ BuildRequires: uriparser-devel BuildRequires: libnotify-devel BuildRequires: libXScrnSaver-devel +BuildRequires: doxygen graphviz Requires: open-vm-tools-kmod >= %{version} Obsoletes: open-vm-tools-kmod < %{version} @@ -41,11 +44,22 @@ machines. This package contains the user-space programs and libraries of open-vm-tools. +%package libs +Summary: Libraries for %{name} +Group: System Environment/Libraries + + +%description libs +The %{name}-libs package contains the runtime shared libraries for +%{name}. + + %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} + %description devel Open-vm-tools are the open source implementation of VMware Tools. They are a set of guest operating system virtualization components that @@ -56,6 +70,7 @@ %prep %setup -q -n open-vm-tools-%{builddate}-%{buildver} +%patch0 -p1 -b .pluginpath # Fix some permissions and formats chmod -x NEWS README ChangeLog AUTHORS COPYING sed -i 's/\r//' README @@ -64,6 +79,7 @@ %build %configure \ --disable-static \ + --enable-docs \ --disable-dependency-tracking \ --without-kernel-modules \ --without-root-privileges \ @@ -81,9 +97,9 @@ make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -# Install vmware-guestd init script +# Install vmtoolsd init script mkdir -p $RPM_BUILD_ROOT/etc/init.d/ -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/vmware-guestd +install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/vmtoolsd # GPM vmmouse support mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig @@ -95,7 +111,7 @@ # Install VMCI sockets header file mkdir -p $RPM_BUILD_ROOT%{_includedir} -install -m 0644 modules/linux/vsock/linux/vmci_sockets.h $RPM_BUILD_ROOT%{_includedir} +install -m 0644 lib/include/vmci_sockets.h $RPM_BUILD_ROOT%{_includedir} # Move vmware-user desktop into autostart directory mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart @@ -108,7 +124,10 @@ # Setup module-init-tools file for vmxnet mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d -install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/vmnics +install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/vmnics.conf + +# Set suid bit on vmware-user suid wrapper +chmod +s $RPM_BUILD_ROOT%{_bindir}/vmware-user-suid-wrapper %clean @@ -118,7 +137,7 @@ %post # Setup guestd on initial install /sbin/ldconfig -[ $1 -lt 2 ] && /sbin/chkconfig vmware-guestd on ||: +[ $1 -lt 2 ] && /sbin/chkconfig vmtoolsd on ||: update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : @@ -131,28 +150,32 @@ # Remove on uninstall if [ "$1" = 0 ] then - /sbin/service vmware-guestd stop > /dev/null 2>&1 || : - /sbin/chkconfig --del vmware-guestd ||: + /sbin/service vmtoolsd stop > /dev/null 2>&1 || : + /sbin/chkconfig --del vmtoolsd ||: fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README +%doc %{_docdir}/open-vm-tools %{_bindir}/vm* -%{_sbindir}/vmware* %{_datadir}/applications/*.desktop %{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/pixmaps/*.xpm -%{_libdir}/*.so.* -%{_libdir}/open-vm-tools +%{_datadir}/open-vm-tools %{_sysconfdir}/init.d/* %{_sysconfdir}/vmware-tools %config(noreplace) %{_sysconfdir}/pam.d/* %config(noreplace) %{_sysconfdir}/sysconfig/mouse %config(noreplace) %{_sysconfdir}/modprobe.d/* %attr(4755,root,root) /sbin/mount.vmhgfs -%attr(4755,root,root) %{_bindir}/vmware-user-suid-wrapper + + +%files libs +%defattr(-,root,root,-) +%{_libdir}/*.so.* +%{_libdir}/open-vm-tools %files devel @@ -162,6 +185,13 @@ %changelog +* Tue Jun 30 2009 Denis Leroy <denis(a)poolshark.org&gt; - 0.0.0.172495-1 +- Update to upstream build 172495 +- Split libs subpackage for multilib friendliness +- Added pam-devel BR +- Switch to vmtoolsd for vmsvc, updated init file +- Added patch to fix default vmtoolsd plugin path + * Fri Apr 3 2009 Denis Leroy <denis(a)poolshark.org&gt; - 0.0.0.154848-3 - Fixing ExclusiveArch Index: sources =================================================================== RCS file: /cvs/free/rpms/open-vm-tools/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Mar 2009 10:48:04 -0000 1.6 +++ sources 30 Jun 2009 10:46:21 -0000 1.7 @@ -1 +1 @@ -23d577a1bc07fa61bcd5352e94f05ed6 open-vm-tools-2009.03.18-154848.tar.gz +8bd5304e84465005bb01b5055497cce1 open-vm-tools-2009.06.18-172495.tar.gz