- release 3

[packages/gimp.git] / gimp.spec

diff --git a/gimp.spec b/gimp.spec
index a62355dca6eb373b435d43674c2d5cf31d3c2c67..15e6a364911f0dba55b81ef0598982c1dd7e82c5 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -23,16 +23,17 @@ 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.11
+Version:       2.6.12
 Release:       3
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: bb2939fe13e54fc7255cef5d097bb5dd
+# Source0-md5: 9f876ee63a0c4a4c83f50f32fb3bbe63
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-gcc4.patch
+Patch3:                %{name}-udev.patch
 URL:           http://www.gimp.org/
 %{?with_aalib:BuildRequires:   aalib-devel}
 BuildRequires: alsa-lib-devel >= 1.0.11
@@ -40,16 +41,17 @@ BuildRequires:      autoconf >= 2.54
 BuildRequires: automake
 BuildRequires: babl-devel >= 0.0.22
 BuildRequires: curl-devel >= 7.15.1
+BuildRequires: cairo-devel >= 1.4.10
 BuildRequires: dbus-glib-devel >= 0.70
 BuildRequires: docbook-dtd412-xml
+BuildRequires: fontconfig-devel >= 1:2.2.0
 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
-%{?with_webkit:BuildRequires:  gtk-webkit-devel >= 1.0}
-BuildRequires: hal-devel >= 0.5.7
+%{?with_webkit:BuildRequires:  gtk-webkit-devel >= 1.1.0}
 BuildRequires: intltool >= 0.36.3
 BuildRequires: iso-codes
 BuildRequires: lcms-devel >= 1.16
@@ -64,9 +66,10 @@ BuildRequires:       libtool >= 1:1.4.2-9
 BuildRequires: libwmf-devel >= 2:0.2.8
 BuildRequires: pango-devel >= 1:1.18.0
 BuildRequires: pkgconfig >= 1:0.16
-BuildRequires: poppler-glib-devel >= 0.6
+BuildRequires: poppler-devel >= 0.17
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: udev-glib-devel >= 1:167
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXfixes-devel
 BuildRequires: xorg-lib-libXmu-devel
@@ -81,7 +84,8 @@ BuildRequires:        libgnomeui-devel >= 2.15.91
 BuildRequires: python-devel >= 1:2.5
 BuildRequires: python-pygtk-devel >= 2:2.10.4
 %endif
-Requires(post,postun): gtk+2 >= 2:2.10.13
+Requires(post,postun): gtk-update-icon-cache
+Requires(post,postun): hicolor-icon-theme
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      curl >= 7.15.1
 Requires:      dbus-glib >= 0.70
@@ -320,6 +324,9 @@ Wtyczka SVG dla GIMPa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+mv modules/gimpinputdevicestore-hal.c modules/gimpinputdevicestore-gudev.c
 
 %build
 rm acinclude.m4 m4macros/gtk-doc.m4
@@ -352,12 +359,9 @@ rm -rf $RPM_BUILD_ROOT
 ln -s gimptool-2.0 $RPM_BUILD_ROOT%{_bindir}/gimptool
 echo '.so gimptool-2.0.1' > $RPM_BUILD_ROOT%{_mandir}/man1/gimptool.1
 
-# Remove obsolete files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/modules/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/python/*.{a,la,py}
-
-# error: gimp-2.4.6-1: req /usr/share/locale/ca@valencia/LC_MESSAGES not found
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ca@valencia
+# remove unneeded files
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/modules/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/python/*.{a,la,py}
 
 %find_lang %{name} --all-name
 
@@ -367,12 +371,12 @@ rm -rf $RPM_BUILD_ROOT
 %post
 umask 022
 [ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+%update_icon_cache hicolor
 
 %postun
 umask 022
 [ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+%update_icon_cache hicolor
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig