rpms/gimp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

drop support for building with non-modular X

Browse Source
This commit is contained in:
Nils Philippsen 2011-06-07 13:14:46 +02:00
parent a954c2d1ca
commit 5b7e0b8fab
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gimp.spec
View File

@ -2,8 +2,6 @@
# Use the following --with/--without <option> switches to control how the # Use the following --with/--without <option> switches to control how the
# package will be built: # package will be built:
# #
# modular_x: modular X dependencies
%bcond_without modular_x
# lcms: lcms support # lcms: lcms support
%bcond_without lcms %bcond_without lcms
# python: python support # python: python support
@ -38,7 +36,7 @@ Summary: GNU Image Manipulation Program
Name: gimp Name: gimp
Epoch: 2 Epoch: 2
Version: 2.6.11 Version: 2.6.11
Release: 14%{?dist} Release: 15%{?dist}
%define binver 2.6 %define binver 2.6
%define gimp_lang_ver 20 %define gimp_lang_ver 20
%define interfacever 2.0 %define interfacever 2.0
@ -93,12 +91,8 @@ BuildRequires: webkitgtk-devel >= 1.1.0
%else %else
BuildRequires: WebKit-gtk-devel >= 1.1.0 BuildRequires: WebKit-gtk-devel >= 1.1.0
%endif %endif
%if %{with modular_x}
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: libXmu-devel BuildRequires: libXmu-devel
%else
BuildRequires: xorg-x11-devel
%endif
BuildRequires: sed BuildRequires: sed
BuildRequires: intltool BuildRequires: intltool
BuildRequires: gettext BuildRequires: gettext
@ -214,7 +208,6 @@ viewing GIMP online help.
cat << EOF cat << EOF
Build options: Build options:
modular X: %{with modular_x}
LCMS support: %{with lcms} LCMS support: %{with lcms}
Python support: %{with python} Python support: %{with python}
MP support: %{with mp} MP support: %{with mp}
@ -511,6 +504,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/gimp/%{interfacever}/plug-ins/help-browser %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
%changelog %changelog
* Tue Jun 07 2011 Nils Philippsen <nils@redhat.com> - 2:2.6.11-15
- drop support for building with non-modular X
* Mon May 23 2011 Nils Philippsen <nils@redhat.com> - 2:2.6.11-14 * Mon May 23 2011 Nils Philippsen <nils@redhat.com> - 2:2.6.11-14
- fix buffer overflows in sphere-designer (CVE-2010-4541), - fix buffer overflows in sphere-designer (CVE-2010-4541),
gfig (CVE-2010-4542), lighting (CVE-2010-4540) plugins gfig (CVE-2010-4542), lighting (CVE-2010-4540) plugins