From 41f57b8cdc74ab15f17bb0511d3df00a47ec37d5 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 26 Aug 2015 14:59:23 +0200 Subject: [PATCH] Fix #1190540 and #1226369 --- open-vm-tools.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 70454fa..fc65daf 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -28,7 +28,7 @@ Name: open-vm-tools Version: %{toolsversion} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Group: Applications/System License: GPLv2 @@ -77,7 +77,6 @@ BuildRequires: systemd BuildRequires: xerces-c-devel BuildRequires: xml-security-c-devel -Requires: initscripts Requires: coreutils Requires: net-tools Requires: grep @@ -153,6 +152,9 @@ find %{buildroot}%{_libdir} -name '*.la' -delete rm -fr %{buildroot}%{_defaultdocdir} rm -f docs/api/build/html/FreeSans.ttf +# Remove mount.vmhgfs +rm -f %{buildroot}%{_sbindir} + # Move vm-support to /usr/bin mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir} @@ -200,7 +202,9 @@ fi %postun devel -p /sbin/ldconfig %files -%doc AUTHORS ChangeLog COPYING NEWS README +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS ChangeLog NEWS README %config(noreplace) %{_sysconfdir}/pam.d/* %{_sysconfdir}/vmware-tools/ %config(noreplace) %{_sysconfdir}/vmware-tools/*.conf @@ -226,9 +230,7 @@ fi %{_libdir}/%{name}/plugins/common/*.so %dir %{_libdir}/%{name}/plugins/vmsvc %{_libdir}/%{name}/plugins/vmsvc/*.so -%exclude %{_sbindir}/mount.vmhgfs %{_datadir}/%{name}/ -%exclude /sbin/ %{_unitdir}/%{toolsdaemon}.service %{_unitdir}/%{vgauthdaemon}.service @@ -250,6 +252,12 @@ fi %{_libdir}/libvmtools.so %changelog +* Wed Aug 26 2015 Simone Caronni - 9.10.2-2 +- Add license macro. +- Remove initscripts requirement (#1226369). +- Delete mount.vmhgfs instead of excluding from packaging, so the debug + information is not included in the package (#1190540). + * Tue Jul 07 2015 Ravindra Kumar - 9.10.2-1 - Package new upstream version open-vm-tools-9.10.2-2822639 - Removed the patches that are no longer needed