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)
This commit is contained in:
parent
014e9ab630
commit
be088325fd
27
gimp-2.0.1-gimphelpmissing.patch
Normal file
27
gimp-2.0.1-gimphelpmissing.patch
Normal file
@ -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);
|
||||
}
|
14
gimp.spec
14
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"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user