SPECS: gimp.spec - removed obsolete nognome patch, use --disable-g...

[qboosh]

Author: qboosh                       Date: Thu Dec  6 22:57:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed obsolete nognome patch, use --disable-gnomevfs instead
- updated some deps

---- Files affected:
SPECS:
   gimp.spec (1.281 -> 1.282) 

---- Diffs:

================================================================
Index: SPECS/gimp.spec
diff -u SPECS/gimp.spec:1.281 SPECS/gimp.spec:1.282
--- SPECS/gimp.spec:1.281	Thu Nov 22 21:18:46 2007
+++ SPECS/gimp.spec	Thu Dec  6 23:57:45 2007
@@ -2,10 +2,14 @@
 #
 # Conditional build:
 %bcond_without	aalib		# without aa plugin (which requires aalib)
-%bcond_without	gnome		# don't build GNOME based features
+%bcond_without	gnomevfs	# without GNOME VFS support
+%bcond_without	gnome		# convenient alias for gnomevfs
 %bcond_without	python		# without python plugins
 %bcond_with	posix_shm	# with POSIX SHM (default is SysV SHM)
 #
+%if %{without gnome}
+%undefine	with_gnomevfs
+%endif
 %define	mver	2.0
 Summary:	The GNU Image Manipulation Program
 Summary(de.UTF-8):	Das GNU-Bildbearbeitungs-Programm
@@ -29,21 +33,23 @@
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-gcc4.patch
-Patch3:		%{name}-nognome.patch
 URL:		http://www.gimp.org/
 %{?with_aalib:BuildRequires:	aalib-devel}
 BuildRequires:	alsa-lib-devel >= 1.0.11
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
+BuildRequires:	curl-devel >= 7.15.1
+BuildRequires:	dbus-devel >= 0.70
 BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
-BuildRequires:	gtk+2-devel >= 2:2.10.6
+BuildRequires:	glib2-devel >= 1:2.12.3
+BuildRequires:	gtk+2-devel >= 2:2.10.13
 BuildRequires:	gtk-doc >= 1.6
-BuildRequires:	hal-devel
+BuildRequires:	hal-devel >= 0.5.7
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	lcms-devel
 BuildRequires:	libart_lgpl-devel
-BuildRequires:	libexif-devel
+BuildRequires:	libexif-devel >= 0.6.15
 BuildRequires:	libgtkhtml-devel >= 2.6.3
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel
@@ -52,20 +58,25 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libwmf-devel >= 2:0.2.8
+BuildRequires:	pango-devel >= 1:1.12.2
 BuildRequires:	pkgconfig
 BuildRequires:	poppler-glib-devel >= 0.6
 BuildRequires:	rpm-pythonprov
 BuildRequires:	xorg-lib-libXpm-devel
-%{?with_python:BuildRequires:	python-pygtk-devel >= 1:2.9.3}
-%if %{with gnome}
+%{?with_python:BuildRequires:	python-pygtk-devel >= 1:2.10.4}
+%if %{with gnomevfs}
 BuildRequires:	gnome-keyring-devel >= 0.5.1
 BuildRequires:	gnome-vfs2-devel >= 2.15.91
 BuildRequires:	libgnomeui-devel >= 2.15.91
 %endif
+Requires(post,postun):	gtk+2 >= 2:2.10.13
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post,postun):	gtk+2 >= 2:2.10.6
+Requires:	curl >= 7.15.1
+Requires:	glib2 >= 1:2.12.3
+Requires:	gtk+2 >= 2:2.10.13
 Requires:	hicolor-icon-theme
-%{?with_python:Requires:	python-pygtk-gtk >= 1:2.9.3}
+Requires:	pango >= 1:1.12.2
+%{?with_python:Requires:	python-pygtk-gtk >= 1:2.10.4}
 Obsoletes:	gimp-data-min
 Obsoletes:	gimp-libgimp
 Obsoletes:	gimp-print
@@ -281,7 +292,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%{!?with_gnome:%patch3 -p1}
 
 %build
 %{__libtoolize}
@@ -290,6 +300,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	%{!?with_gnomevfs:--disable-gnomevfs} \
 	--disable-rpath \
 	%{!?with_python: --disable-python} \
 	--enable-mp \
@@ -439,6 +450,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.282  2007-12-06 22:57:45  qboosh
+- removed obsolete nognome patch, use --disable-gnomevfs instead
+- updated some deps
+
 Revision 1.281  2007-11-22 20:18:46  wolf
 - 2.4.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gimp.spec?r1=1.281&r2=1.282&f=u