- release 2

[packages/gimp.git] / gimp.spec

diff --git a/gimp.spec b/gimp.spec
index 9ae14046e246ed225366a7ec18172637d9ee3f40..418cb427d1cc55273fdfcc9cf2e35267bea4a9fc 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -23,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.8
-Release:       1
+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: a4d9462c9420954824a80c9b1963f9d9
+# Source0-md5: b92710ad9f1b52fec98554d765473819
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-gcc4.patch
@@ -41,6 +41,7 @@ BuildRequires:        automake
 BuildRequires: babl-devel >= 0.0.22
 BuildRequires: curl-devel >= 7.15.1
 BuildRequires: dbus-glib-devel >= 0.70
+BuildRequires: docbook-dtd412-xml
 BuildRequires: gegl-devel >= 0.0.18
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
@@ -64,10 +65,11 @@ BuildRequires:      libwmf-devel >= 2:0.2.8
 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
@@ -311,8 +313,10 @@ Wtyczka SVG dla GIMPa.
 %patch2 -p1
 
 %build
+rm acinclude.m4 m4macros/gtk-doc.m4
+%{__gtkdocize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4macros
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -326,7 +330,7 @@ Wtyczka SVG dla GIMPa.
        --with-html-dir=%{_gtkdocdir} \
        %{?with_posix_shm:--with-shm=posix} \
        %{!?with_webkit:--without-webkit}
-       
+
 %{__make}
 
 %install