- Put Fedora 23 specific fix under a conditional, so that the change

can be backported to other branches easily.
This commit is contained in:
Ravindra Kumar 2015-05-08 20:48:06 -07:00
parent 525321129d
commit acdd879ebe

View File

@ -28,7 +28,7 @@
Name: open-vm-tools Name: open-vm-tools
Version: %{toolsversion} Version: %{toolsversion}
Release: 2%{?dist} Release: 3%{?dist}
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
Group: Applications/System Group: Applications/System
License: GPLv2 License: GPLv2
@ -54,12 +54,14 @@ BuildRequires: doxygen
BuildRequires: fuse-devel BuildRequires: fuse-devel
BuildRequires: glib2-devel >= 2.14.0 BuildRequires: glib2-devel >= 2.14.0
BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: gtk2-devel >= 2.4.0
%if 0%{?fedora} >= 23
# F23 split gdk-pixbuf2-devel >= 2.31.3-5 into 3 packages, # F23 split gdk-pixbuf2-devel >= 2.31.3-5 into 3 packages,
# gdk-pixbuf2-devel, gdk-pixbuf2-modules-devel, and # gdk-pixbuf2-devel, gdk-pixbuf2-modules-devel, and
# gdk-pixbuf2-xlib-devel. gtk2-devel does not depend on # gdk-pixbuf2-xlib-devel. gtk2-devel does not depend on
# gdk-pixbuf2-xlib-devel. Therefore, we need to pull in # gdk-pixbuf2-xlib-devel. Therefore, we need to pull in
# gdk-pixbuf2-xlib-devel dependency ourselves. # gdk-pixbuf2-xlib-devel dependency ourselves.
BuildRequires: gdk-pixbuf2-xlib-devel BuildRequires: gdk-pixbuf2-xlib-devel
%endif
BuildRequires: gtkmm24-devel BuildRequires: gtkmm24-devel
BuildRequires: libdnet-devel BuildRequires: libdnet-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
@ -256,6 +258,10 @@ fi
%{_libdir}/libvmtools.so %{_libdir}/libvmtools.so
%changelog %changelog
* Fri May 15 2015 Ravindra Kumar <ravindrakumar@vmware.com> - 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 <ravindrakumar@vmware.com> - 9.10.0-2 * Fri May 08 2015 Ravindra Kumar <ravindrakumar@vmware.com> - 9.10.0-2
- F23 has split gdk-pixbuf2-devel >= 2.31.3-5 into 3 packages, gdk-pixbuf2-devel, - 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 gdk-pixbuf2-modules-devel, and gdk-pixbuf2-xlib-devel. gtk2-devel does not depend