- release 2

[packages/gimp.git] / gimp.spec

diff --git a/gimp.spec b/gimp.spec
index 1b36287225170085f55108dd4a3345d3e132759f..418cb427d1cc55273fdfcc9cf2e35267bea4a9fc 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -4,6 +4,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}
@@ -22,13 +23,13 @@ Summary(uk.UTF-8):  The GNU Image Manipulation Program
 Summary(zh_CN.UTF-8):  [图像]GNU图象处理工具
 Summary(zh_TW.UTF-8):  [圖像]GNU圖象處理工具
 Name:          gimp
-Version:       2.6.0
+Version:       2.6.10
 Release:       2
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: e5ac955fee8b376d431e4693027d7640
+# Source0-md5: b92710ad9f1b52fec98554d765473819
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-gcc4.patch
@@ -39,20 +40,21 @@ BuildRequires:      autoconf >= 2.54
 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: docbook-dtd412-xml
 BuildRequires: gegl-devel >= 0.0.18
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
-BuildRequires: glib2-devel >= 1:2.12.3
-BuildRequires: gtk+2-devel >= 2:2.10.13
+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.0
-BuildRequires: lcms-devel
+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
@@ -60,12 +62,14 @@ BuildRequires:      librsvg-devel >= 1:2.15.0
 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: pango-devel >= 1:1.18.0
 BuildRequires: pkgconfig
 BuildRequires: poppler-glib-devel >= 0.6
+%{?with_python:BuildRequires:  python-pygtk-devel >= 1:2.10.4}
 BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXpm-devel
-%{?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
@@ -309,21 +313,24 @@ Wtyczka SVG dla GIMPa.
 %patch2 -p1
 
 %build
+rm acinclude.m4 m4macros/gtk-doc.m4
+%{__gtkdocize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4macros
 %{__autoconf}
 %{__autoheader}
 %{__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}
 
 %install