version 2.2.9 first attempt at dealing with modular X

.cvsignore

@@ -1 +1 @@
-gimp-2.2.8.tar.bz2
+gimp-2.2.9.tar.bz2

gimp.spec

@@ -1,3 +1,4 @@
+%define _enable_modularX %{?enable_modularX:%{enable_modularX}}%{?!enable_modularX:1}
 %define _enable_python %{?enable_python:%{enable_python}}%{?!enable_python:1}
 %define _enable_mp %{?enable_mp:%{enable_mp}}%{?!enable_mp:1}
 %define _enable_static %{?enable_static:%{enable_static}}%{?!enable_static:1}
@@ -6,7 +7,7 @@
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.8
+Version: 	2.2.9
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -14,7 +15,7 @@ Version: 	2.2.8
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 	%{?prever:0.0.%{prever}.}3
+Release: 	%{?prever:0.0.%{prever}.}1
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -35,7 +36,14 @@ BuildRequires:	libtiff-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libexif-devel
+%if %_enable_modularX
+BuildRequires:	libX11-devel
+BuildRequires:	libXmu-devel
+# these are req's for libXmu but not yet required by libXmu-devel
+BuildRequires:	libXt-devel
+%else
 BuildRequires:	xorg-x11-devel
+%endif
 BuildRequires:	gimp-print-devel >= 4.2.0
 BuildRequires:	automake >= 1.7
 BuildRequires:	autoconf >= 2.54
@@ -319,6 +327,10 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Nov 02 2005 Nils Philippsen <nphilipp@redhat.com> - 2.2.9
+- version 2.2.9
+- first attempt at dealing with modular X
+
 * Tue Aug 16 2005 Nils Philippsen <nphilipp@redhat.com>
 - rebuild
 

sources

@@ -1 +1 @@
-0db3fca2f741d6dd51eb61dc85778b16  gimp-2.2.8.tar.bz2
+737f4e74044427c12e30217dff0f29f5  gimp-2.2.9.tar.bz2