SPECS (DEVEL): gimp.spec - 2.3.8, updated BR, added gnome bcond, d...

[freetz]

Author: freetz                       Date: Fri Apr 14 09:30:08 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 2.3.8, updated BR, added gnome bcond, dropped pixmapsdir support,
  switch off print bcond when gnome support is on (provides print support
  too), NFY (feedback needed)

---- Files affected:
SPECS:
   gimp.spec (1.218.2.30 -> 1.218.2.31) 

---- Diffs:

================================================================
Index: SPECS/gimp.spec
diff -u SPECS/gimp.spec:1.218.2.30 SPECS/gimp.spec:1.218.2.31
--- SPECS/gimp.spec:1.218.2.30	Thu Apr  6 00:03:47 2006
+++ SPECS/gimp.spec	Fri Apr 14 11:30:03 2006
@@ -2,10 +2,15 @@
 #
 # Conditional build:
 %bcond_without	aalib		# without aa plugin (which requires aalib)
+%bcond_without	gnome		# don't build GNOME based features (like gnome-print support)
 %bcond_without	print		# without print plugin (which requires gimp-print 4.2.x)
 %bcond_without	python		# without python plugins
 %bcond_with	posix_shm	# with POSIX SHM (default is SysV SHM)
 #
+%if %{with gnome}
+%undefine	with_print
+%endif
+#
 %define	mver	2.0
 Summary:	The GNU Image Manipulation Program
 Summary(de):	Das GNU-Bildbearbeitungs-Programm
@@ -19,13 +24,13 @@
 Summary(zh_CN):	[ÍźĎń]GNUÍźĎó´ŚŔ횤žß
 Summary(zh_TW):	[šĎšł]GNUšĎśHłB˛z¤u¨ă
 Name:		gimp
-Version:	2.3.7
-Release:	3
+Version:	2.3.8
+Release:	0.1
 Epoch:		1
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.gimp.org/pub/gimp/v2.3/%{name}-%{version}.tar.bz2
-# Source0-md5:	dfc47a29b3a7ade07bd17244f0e83311
+# Source0-md5:	393e7fb4e5e141faa2e3b44da3f301e3
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-gcc4.patch
@@ -37,7 +42,7 @@
 BuildRequires:	gettext-devel
 %{?with_print:BuildRequires:	gimp-print-devel >= 4.2.6}
 %{?with_print:BuildRequires:	gimp-print-devel < 4.3.0}
-BuildRequires:	gtk+2-devel >= 2:2.8.0
+BuildRequires:	gtk+2-devel >= 2:2.8.8
 BuildRequires:	gtk-doc >= 1.0
 BuildRequires:	intltool
 BuildRequires:	lcms-devel
@@ -47,7 +52,7 @@
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libpng-devel >= 1.0.8
-BuildRequires:	librsvg-devel >= 2.2.0
+BuildRequires:	librsvg-devel >= 2.8.0
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libungif-devel
@@ -55,8 +60,14 @@
 BuildRequires:	pkgconfig
 BuildRequires:	poppler-glib-devel >= 0.3.1
 %{?with_python:BuildRequires:	python-pygtk-devel >= 1.99.15}
+%if %{with gnome}
+BuildRequires:	gnome-keyring-devel >= 0.4.5
+BuildRequires:	gnome-vfs2-devel >= 2.10.0
+BuildRequires:	libgnomeprintui >= 2.10.0
+BuildRequires:	libgnomeui-devel >= 2.10.0
+%endif
 Requires:	hicolor-icon-theme
-Requires:	gtk+2 >= 2:2.8.0
+Requires:	gtk+2 >= 2:2.8.8
 %{?with_python:Requires:	python-pygtk-gtk >= 1.99.15}
 Obsoletes:	gimp-data-min
 Obsoletes:	gimp-libgimp
@@ -187,7 +198,7 @@
 Requires(post,postun):	/sbin/ldconfig
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	gtk-doc-common
-Requires:	gtk+2-devel >= 2:2.4.4
+Requires:	gtk+2-devel >= 2:2.8.8
 
 %description devel
 Header files for writing GIMP plugins and extensions.
@@ -275,8 +286,6 @@
 %patch1 -p1
 %patch2 -p1
 
-cp /usr/share/automake/py-compile plug-ins/pygimp
-
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -286,6 +295,7 @@
 
 %configure \
 	--disable-rpath \
+	%{!?with_gnome: --without-gnomeprint} \
 	%{!?with_print: --disable-print} \
 	%{!?with_python: --disable-python} \
 	--enable-mp \
@@ -304,8 +314,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install data/images/wilber-icon.png $RPM_BUILD_ROOT%{_pixmapsdir}
-
 ################### end hack ############################
 
 # Link gimptool to gimptool-2.0
@@ -356,6 +364,7 @@
 %{_libdir}/gimp/%{mver}/interpreters
 %attr(755,root,root) %{_libdir}/gimp/%{mver}/plug-ins/*
 %{?with_aalib:%exclude %{_libdir}/gimp/%{mver}/plug-ins/aa}
+%{?with_gnome:%{_libdir}/gimp/%{mver}/plug-ins/gnomeprint}
 %{?with_print:%exclude %{_libdir}/gimp/%{mver}/plug-ins/print}
 %exclude %{_libdir}/gimp/%{mver}/plug-ins/svg
 
@@ -396,8 +405,7 @@
 %config %{_sysconfdir}/%{name}/%{mver}/unitrc
 %config %{_sysconfdir}/%{name}/%{mver}/controllerrc
 
-%{_iconsdir}/hicolor/48x48/apps/gimp.png
-%{_pixmapsdir}/*
+%{_iconsdir}/hicolor/*/apps/gimp.*
 
 %files devel
 %defattr(644,root,root,755)
@@ -440,6 +448,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218.2.31  2006/04/14 09:30:03  freetz
+- 2.3.8, updated BR, added gnome bcond, dropped pixmapsdir support,
+  switch off print bcond when gnome support is on (provides print support
+  too), NFY (feedback needed)
+
 Revision 1.218.2.30  2006/04/05 22:03:47  adgor
 - Reverted (as freetz said)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gimp.spec?r1=1.218.2.30&r2=1.218.2.31&f=u