X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gimp.spec;h=955976205b7423d9c86f5af608e6b54a59784272;hb=9635424d508f49ad08be0d72411885edec177ae0;hp=3dd75afeea13966f670b85a6a8cf384f900a8ec3;hpb=d4529619db182c3dfe833cc8bad4073409dcd04b;p=packages%2Fgimp.git

diff --git a/gimp.spec b/gimp.spec
index 3dd75af..9559762 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -1,15 +1,12 @@
 #
+# TODO: some unpackaged files
+#
 # Conditional build:
 %bcond_without	aalib		# without aa plugin (which requires aalib)
-%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}
-%undefine	with_gnomevfs
-%endif
 %define	mver	2.0
 Summary:	The GNU Image Manipulation Program
 Summary(de.UTF-8):	Das GNU-Bildbearbeitungs-Programm
@@ -23,13 +20,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.6
+Version:	2.8.0
 Release:	1
 Epoch:		1
-License:	GPL v2+
+License:	GPL v3+
 Group:		X11/Applications/Graphics
-Source0:	ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
-# Source0-md5:	23d880dd09cd62c936ed04666a53f8e4
+Source0:	ftp://ftp.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	28997d14055f15db063eb92e1c8a7ebb
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-gcc4.patch
@@ -38,21 +35,21 @@ URL:		http://www.gimp.org/
 BuildRequires:	alsa-lib-devel >= 1.0.11
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
-BuildRequires:	babl-devel >= 0.0.22
+BuildRequires:	babl-devel >= 0.1.4
 BuildRequires:	curl-devel >= 7.15.1
+BuildRequires:	cairo-devel >= 1.4.10
 BuildRequires:	dbus-glib-devel >= 0.70
-BuildRequires:	gegl-devel >= 0.0.18
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gegl-devel >= 0.2.0
 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 >= 0.1}
-BuildRequires:	hal-devel >= 0.5.7
-BuildRequires:	intltool >= 0.35.5
+%{?with_webkit:BuildRequires:	gtk-webkit-devel >= 1.1.0}
+BuildRequires:	intltool >= 0.36.3
 BuildRequires:	iso-codes
 BuildRequires:	lcms-devel >= 1.16
-BuildRequires:	libart_lgpl-devel
 BuildRequires:	libexif-devel >= 0.6.15
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel
@@ -62,24 +59,23 @@ BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libwmf-devel >= 2:0.2.8
 BuildRequires:	pango-devel >= 1:1.18.0
-BuildRequires:	pkgconfig
-BuildRequires:	poppler-glib-devel >= 0.6
+BuildRequires:	pkgconfig >= 1:0.16
+BuildRequires:	poppler-devel >= 0.17
+%{?with_python:BuildRequires:	python-pygtk-devel >= 1:2.10.4}
 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
 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
-BuildRequires:	libgnomeui-devel >= 2.15.91
-%endif
 Requires(post,postun):	gtk+2 >= 2:2.10.13
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	curl >= 7.15.1
-Requires:	glib2 >= 1:2.12.3
-Requires:	gtk+2 >= 2:2.10.13
+Requires:	dbus-glib >= 0.70
 Requires:	hicolor-icon-theme
-Requires:	pango >= 1:1.12.2
+Requires:	lcms >= 1.16
+Requires:	libexif >= 0.6.15
 %{?with_python:Requires:	python-pygtk-gtk >= 1:2.10.4}
 Obsoletes:	gimp-data-min
 Obsoletes:	gimp-libgimp
@@ -196,16 +192,18 @@ ftp://ftp.gimp.org/pub/gimp/fonts/sharefonts-0.10.tar.gz. якщо хочете
 
 %package libs
 Summary:	GIMP libraries
-Summary(pl.UTF-8):	Biblioteki GIMPa
+Summary(pl.UTF-8):	Biblioteki GIMP-a
 License:	LGPL v2+
 Group:		Libraries
-Requires:	gtk+2 >= 2:2.10.6
+Requires:	glib2 >= 1:2.16.1
+Requires:	gtk+2 >= 2:2.12.5
+Requires:	pango >= 1:1.18.0
 
 %description libs
 This package contains GIMP libraries.
 
 %description libs -l pl.UTF-8
-Pakiet zawiera biblioteki GIMPa.
+Pakiet zawiera biblioteki GIMP-a.
 
 %package devel
 Summary:	GIMP plugin and extension development kit
@@ -222,7 +220,8 @@ Summary(zh_TW.UTF-8):	[開發]gimp的開發包
 License:	LGPL v2+
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.10.0
+Requires:	glib2-devel >= 1:2.16.1
+Requires:	gtk+2-devel >= 2:2.12.5
 
 %description devel
 Header files for writing GIMP plugins and extensions.
@@ -296,7 +295,7 @@ Summary:	SVG plugin for GIMP
 Summary(pl.UTF-8):	Wtyczka SVG dla GIMPa
 Group:		X11/Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	librsvg >= 2.2.0
+Requires:	librsvg >= 2.15.0
 
 %description svg
 SVG plugin for GIMP.
@@ -309,24 +308,25 @@ Wtyczka SVG dla GIMPa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+#%patch3 -p1
 
 %build
+rm acinclude.m4
+%{__gtkdocize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4macros
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	%{!?with_gnomevfs:--disable-gnomevfs} \
 	%{!?with_python:--disable-python} \
 	--enable-default-binary \
-	--enable-gimp-remote \
 	--enable-gtk-doc \
 	--enable-static \
 	--with-html-dir=%{_gtkdocdir} \
 	%{?with_posix_shm:--with-shm=posix} \
 	%{!?with_webkit:--without-webkit}
-	
+
 %{__make}
 
 %install
@@ -340,11 +340,10 @@ 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
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/modules/*.{a,la}
+%if %{with python}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/python/*.{a,la,py}
+%endif
 
 %find_lang %{name} --all-name
 
@@ -354,36 +353,29 @@ 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
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog LICENSE NEWS README
 %doc docs/Wilber*
 
-%attr(755,root,root) %{_bindir}/gimp-2.6
+%attr(755,root,root) %{_bindir}/gimp-2.8
 %attr(755,root,root) %{_bindir}/gimp
-%attr(755,root,root) %{_bindir}/gimp-console-2.6
+%attr(755,root,root) %{_bindir}/gimp-console-2.8
 %attr(755,root,root) %{_bindir}/gimp-console
-%attr(755,root,root) %{_bindir}/gimp-remote-2.6
-%attr(755,root,root) %{_bindir}/gimp-remote
 %{_desktopdir}/gimp.desktop
-%{_mandir}/man1/gimp-2.6.1*
-%{_mandir}/man1/gimp.1*
-%{_mandir}/man1/gimp-console-2.6.1*
-%{_mandir}/man1/gimp-console.1*
-%{_mandir}/man1/gimp-remote-2.6.1*
-%{_mandir}/man1/gimp-remote.1*
-%{_mandir}/man5/gimprc-2.6.5*
-%{_mandir}/man5/gimprc.5*
+%{_mandir}/man1/gimp[-.]*
+%{_mandir}/man1/gimp-console[-.]*
+%{_mandir}/man5/gimprc[-.]*
 
 %dir %{_libdir}/gimp
 %dir %{_libdir}/gimp/%{mver}
@@ -407,6 +399,7 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 %dir %{_datadir}/gimp
 %dir %{_datadir}/gimp/%{mver}
 %{_datadir}/gimp/%{mver}/brushes
+%{_datadir}/gimp/%{mver}/dynamics
 %{_datadir}/gimp/%{mver}/fractalexplorer
 %{_datadir}/gimp/%{mver}/gfig
 %{_datadir}/gimp/%{mver}/gflare
@@ -417,8 +410,11 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 %{_datadir}/gimp/%{mver}/palettes
 %{_datadir}/gimp/%{mver}/patterns
 %{_datadir}/gimp/%{mver}/scripts
+%{_datadir}/gimp/%{mver}/tags
 %{_datadir}/gimp/%{mver}/themes
 %{_datadir}/gimp/%{mver}/tips
+%{_datadir}/gimp/%{mver}/tool-presets
+%{_datadir}/gimp/%{mver}/ui
 
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/%{mver}
@@ -427,7 +423,6 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 %config %{_sysconfdir}/%{name}/%{mver}/controllerrc
 %config %{_sysconfdir}/%{name}/%{mver}/gtkrc*
 %config %{_sysconfdir}/%{name}/%{mver}/menurc
-%config %{_sysconfdir}/%{name}/%{mver}/ps-menurc
 %config %{_sysconfdir}/%{name}/%{mver}/sessionrc
 %config %{_sysconfdir}/%{name}/%{mver}/unitrc