[gimp] drop support for building with non-modular X
Nils Philippsen
nphilipp at fedoraproject.org
Tue Jun 7 11:16:20 UTC 2011
commit 5b7e0b8fabf5ade124e97a3164f991ae6d401620
Author: Nils Philippsen <nils at redhat.com>
Date: Tue Jun 7 13:14:46 2011 +0200
drop support for building with non-modular X
gimp.spec | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/gimp.spec b/gimp.spec
index 79e475d..a0a01e5 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -2,8 +2,6 @@
# Use the following --with/--without <option> switches to control how the
# package will be built:
#
-# modular_x: modular X dependencies
-%bcond_without modular_x
# lcms: lcms support
%bcond_without lcms
# python: python support
@@ -38,7 +36,7 @@ Summary: GNU Image Manipulation Program
Name: gimp
Epoch: 2
Version: 2.6.11
-Release: 14%{?dist}
+Release: 15%{?dist}
%define binver 2.6
%define gimp_lang_ver 20
%define interfacever 2.0
@@ -93,12 +91,8 @@ BuildRequires: webkitgtk-devel >= 1.1.0
%else
BuildRequires: WebKit-gtk-devel >= 1.1.0
%endif
-%if %{with modular_x}
BuildRequires: libX11-devel
BuildRequires: libXmu-devel
-%else
-BuildRequires: xorg-x11-devel
-%endif
BuildRequires: sed
BuildRequires: intltool
BuildRequires: gettext
@@ -214,7 +208,6 @@ viewing GIMP online help.
cat << EOF
Build options:
-modular X: %{with modular_x}
LCMS support: %{with lcms}
Python support: %{with python}
MP support: %{with mp}
@@ -511,6 +504,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
%changelog
+* Tue Jun 07 2011 Nils Philippsen <nils at redhat.com> - 2:2.6.11-15
+- drop support for building with non-modular X
+
* Mon May 23 2011 Nils Philippsen <nils at redhat.com> - 2:2.6.11-14
- fix buffer overflows in sphere-designer (CVE-2010-4541),
gfig (CVE-2010-4542), lighting (CVE-2010-4540) plugins
More information about the scm-commits
mailing list