From acdd879ebedbea02bc0edc075755188bb6fdf0f2 Mon Sep 17 00:00:00 2001 From: Ravindra Kumar Date: Fri, 8 May 2015 20:48:06 -0700 Subject: [PATCH] - Put Fedora 23 specific fix under a conditional, so that the change can be backported to other branches easily. --- open-vm-tools.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/open-vm-tools.spec b/open-vm-tools.spec index b463d3d..618fa02 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -28,7 +28,7 @@ Name: open-vm-tools Version: %{toolsversion} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Group: Applications/System License: GPLv2 @@ -54,12 +54,14 @@ BuildRequires: doxygen BuildRequires: fuse-devel BuildRequires: glib2-devel >= 2.14.0 BuildRequires: gtk2-devel >= 2.4.0 +%if 0%{?fedora} >= 23 # F23 split gdk-pixbuf2-devel >= 2.31.3-5 into 3 packages, # gdk-pixbuf2-devel, gdk-pixbuf2-modules-devel, and # gdk-pixbuf2-xlib-devel. gtk2-devel does not depend on # gdk-pixbuf2-xlib-devel. Therefore, we need to pull in # gdk-pixbuf2-xlib-devel dependency ourselves. BuildRequires: gdk-pixbuf2-xlib-devel +%endif BuildRequires: gtkmm24-devel BuildRequires: libdnet-devel BuildRequires: libicu-devel @@ -256,6 +258,10 @@ fi %{_libdir}/libvmtools.so %changelog +* Fri May 15 2015 Ravindra Kumar - 9.10.0-3 +- Put Fedora 23 specific fix under a conditional, so that the change + can be backported to other branches easily if required. + * Fri May 08 2015 Ravindra Kumar - 9.10.0-2 - F23 has split gdk-pixbuf2-devel >= 2.31.3-5 into 3 packages, gdk-pixbuf2-devel, gdk-pixbuf2-modules-devel, and gdk-pixbuf2-xlib-devel. gtk2-devel does not depend