From 95f6173407df161f74ca8737210da2d050d959d5 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 25 Feb 2016 11:47:41 +0000 Subject: [PATCH] =?UTF-8?q?Make=20BRs=20portable=20(thanks=20to=20Nicolas?= =?UTF-8?q?=20L=C3=A9cureuil)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eclipse.spec | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index 9c30a4d..474094d 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -49,7 +49,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 14%{?dist} +Release: 15%{?dist} License: EPL URL: http://www.eclipse.org/ @@ -153,27 +153,27 @@ Patch37: eclipse-bug-487712.patch BuildRequires: rsync BuildRequires: make, gcc -BuildRequires: glib2-devel -BuildRequires: nspr-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: cairo >= 1.0 +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(nspr) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(cairo) BuildRequires: zip, unzip BuildRequires: desktop-file-utils BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: libXt-devel -BuildRequires: libXtst-devel -BuildRequires: gtk2-devel +BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(gtk+-2.0) %if 0%{?fedora} -BuildRequires: gtk3-devel -BuildRequires: webkitgtk-devel -BuildRequires: webkitgtk4-devel +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(webkit-1.0) +BuildRequires: pkgconfig(webkit2gtk-4.0) %else %if 0%{?rhel} >= 7 -BuildRequires: gtk3-devel -BuildRequires: webkitgtk3-devel +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(webkitgtk-3.0) %else -BuildRequires: webkitgtk-devel +BuildRequires: pkgconfig(webkit-1.0) %endif %endif BuildRequires: icu4j >= 1:54.1.1-2 @@ -1130,6 +1130,9 @@ fi %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_* %changelog +* Thu Feb 25 2016 Mat Booth - 1:4.5.1-15 +- Make BRs portable (thanks to Nicolas Lécureuil) + * Wed Feb 24 2016 Roland Grunberg - 1:4.5.1-14 - Gracefully handle broken symbolic links on initialization.