SPECS: gimp.spec - updated BRs, added webkit bcond

qboosh qboosh at pld-linux.org
Sat Oct 25 14:56:07 CEST 2008


Author: qboosh                       Date: Sat Oct 25 12:56:07 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated BRs, added webkit bcond

---- Files affected:
SPECS:
   gimp.spec (1.301 -> 1.302) 

---- Diffs:

================================================================
Index: SPECS/gimp.spec
diff -u SPECS/gimp.spec:1.301 SPECS/gimp.spec:1.302
--- SPECS/gimp.spec:1.301	Wed Oct 15 18:07:59 2008
+++ SPECS/gimp.spec	Sat Oct 25 14:56:01 2008
@@ -5,6 +5,7 @@
 %bcond_without	gnomevfs	# without GNOME VFS support
 %bcond_without	gnome		# convenient alias for gnomevfs
 %bcond_without	python		# without python plugins
+%bcond_without	webkit		# without webkit-based help browser
 %bcond_with	posix_shm	# with POSIX SHM (default is SysV SHM)
 #
 %if %{without gnome}
@@ -40,21 +41,20 @@
 BuildRequires:	automake
 BuildRequires:	babl-devel >= 0.0.22
 BuildRequires:	curl-devel >= 7.15.1
-BuildRequires:	dbus-devel >= 0.70
+BuildRequires:	dbus-glib-devel >= 0.70
 BuildRequires:	gegl-devel >= 0.0.18
 BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
 BuildRequires:	glib2-devel >= 1:2.16.1
 BuildRequires:	gtk+2-devel >= 2:2.12.5
 BuildRequires:	gtk-doc >= 1.6
-BuildRequires:	gtk-webkit-devel
+%{?with_webkit:BuildRequires:	gtk-webkit-devel >= 0.1}
 BuildRequires:	hal-devel >= 0.5.7
 BuildRequires:	intltool >= 0.35.5
 BuildRequires:	iso-codes
 BuildRequires:	lcms-devel >= 1.16
 BuildRequires:	libart_lgpl-devel
 BuildRequires:	libexif-devel >= 0.6.15
-BuildRequires:	libgtkhtml-devel >= 2.6.3
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libpng-devel >= 1.2.12
@@ -319,13 +319,14 @@
 %{__automake}
 %configure \
 	%{!?with_gnomevfs:--disable-gnomevfs} \
-	%{!?with_python: --disable-python} \
-	--with-html-dir=%{_gtkdocdir} \
+	%{!?with_python:--disable-python} \
 	--enable-default-binary \
 	--enable-gimp-remote \
-	--enable-static \
 	--enable-gtk-doc \
-	%{?with_posix_shm:--with-shm=posix}
+	--enable-static \
+	--with-html-dir=%{_gtkdocdir} \
+	%{?with_posix_shm:--with-shm=posix} \
+	%{!?with_webkit:--without-webkit}
 	
 %{__make}
 
@@ -523,6 +524,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.302  2008/10/25 12:56:01  qboosh
+- updated BRs, added webkit bcond
+
 Revision 1.301  2008/10/15 16:07:59  sls
 - updated BR
 
================================================================

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



More information about the pld-cvs-commit mailing list