From be088325fde40292350cc49111a29e4d5366e178 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 05:16:12 +0000
Subject: auto-import changelog data from gimp-2.0.1-6.src.rpm

Mon May 31 2004 Nils Philippsen <nphilipp@redhat.com>
- rebuild for Rawhide
Wed May 26 2004 Nils Philippsen <nphilipp@redhat.com>
- add libjpeg-devel to BuildRequires (#121236)
- spit out slightly more informative help message if gimp-help is missing
    (#124307)

---

diff --git a/gimp-2.0.1-gimphelpmissing.patch b/gimp-2.0.1-gimphelpmissing.patch
new file mode 100644
index 0000000..f44b195
--- /dev/null
+++ b/gimp-2.0.1-gimphelpmissing.patch
@@ -0,0 +1,27 @@
+--- gimp-2.0.1/plug-ins/help/domain.c.gimphelpmissing	2004-03-18 13:18:12.000000000 +0100
++++ gimp-2.0.1/plug-ins/help/domain.c	2004-05-26 16:34:42.316069179 +0200
+@@ -155,17 +155,20 @@
+ 
+       if (! domain_locale_parse (domain, locale, &error))
+         {
+-          const gchar *msg;
++          const gchar *msg, *msg2;
+ 
+-          if (error->code == G_FILE_ERROR_NOENT)
++          if (error->code == G_FILE_ERROR_NOENT) {
+             msg = _("The GIMP help files are not installed.");
+-          else
++            msg2 = _("Please install the gimp-help package to access GIMP help.");
++          } else {
+             msg = _("There is a problem with the GIMP help files.");
++            msg2 = _("Please check your installation.");
++          }
+ 
+           g_message ("%s\n\n%s\n\n%s",
+                      msg,
+                      error->message,
+-                     _("Please check your installation."));
++                     msg2);
+ 
+           g_error_free (error);
+         }
diff --git a/gimp.spec b/gimp.spec
index bc0191a..33f0f4f 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -18,7 +18,7 @@ Version: 	2.0.1
 %if %prever
 Release: 1.%{prever}.1
 %else
-Release: 4
+Release: 6
 %endif
 Epoch:		1
 License: 	GPL, LGPL
@@ -37,6 +37,7 @@ BuildRequires:	gtkhtml2-devel
 BuildRequires:	python-devel
 BuildRequires:	pygtk2-devel
 BuildRequires:	librsvg2-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libmng-devel
@@ -60,6 +61,7 @@ Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{version}/v%{version}/gimp-%{version}.ta
 Source1:	gimp.desktop
 Source2:	gimp.png
 Patch0:		gimp-2.0pre3-buildroot.patch
+Patch1:		gimp-2.0.1-gimphelpmissing.patch
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -111,6 +113,7 @@ GIMP image manipulation program.
 %setup -q
 %endif
 %patch0 -p1 -b .buildroot
+%patch1 -p1 -b .gimphelpmissing
 
 %build
 # aclocal -I m4macros || aclocal-1.6 -I m4macros || aclocal-1.5 -I m4macros
@@ -377,8 +380,17 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps
 %endif
 
 %changelog
+* Mon May 31 2004 Nils Philippsen <nphilipp@redhat.com>
+- rebuild for Rawhide
+
+* Wed May 26 2004 Nils Philippsen <nphilipp@redhat.com>
+- add libjpeg-devel to BuildRequires (#121236)
+- spit out slightly more informative help message if gimp-help is missing
+  (#124307)
+
 * Fri May 21 2004 Matthias Clasen <mclasen@redhat.com>
 - rebuild
+
 * Wed Apr 21 2004 Seth Nickell <snickell@redhat.com>
 - Rename menu entry for .desktop file to "GIMP Image Editor"