rpms/gimp/F-9 gimp-2.6.2-jpeg-units.patch, NONE, 1.1 gimp-2.6.2-xdg-open.patch, NONE, 1.1 .cvsignore, 1.43, 1.44 gimp.spec, 1.161, 1.162 sources, 1.43, 1.44 gimp-2.4.0-htmlview.patch, 1.1, NONE gimp-2.4.0-xdg-open.patch, 1.2, NONE

Tue Nov 11 13:09:34 UTC 2008

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23266

Modified Files:
	.cvsignore gimp.spec sources 
Added Files:
	gimp-2.6.2-jpeg-units.patch gimp-2.6.2-xdg-open.patch 
Removed Files:
	gimp-2.4.0-htmlview.patch gimp-2.4.0-xdg-open.patch 
Log Message:
rebase to 2.6


gimp-2.6.2-jpeg-units.patch:

--- NEW FILE gimp-2.6.2-jpeg-units.patch ---
diff -up gimp-2.6.2/plug-ins/file-jpeg/jpeg-save.c.jpeg-units gimp-2.6.2/plug-ins/file-jpeg/jpeg-save.c
--- gimp-2.6.2/plug-ins/file-jpeg/jpeg-save.c.jpeg-units	2008-10-30 10:32:32.000000000 +0100
+++ gimp-2.6.2/plug-ins/file-jpeg/jpeg-save.c	2008-11-11 12:32:18.000000000 +0100
@@ -192,14 +192,19 @@ background_jpeg_save (PreviewPersistent 
       /* display the preview stuff */
       if (!pp->abort_me)
         {
-          struct stat buf;
-          gchar       temp[128];
+          struct stat  buf;
+          gchar       *text;
+          gchar       *size_text;
 
           g_stat (pp->file_name, &buf);
-          g_snprintf (temp, sizeof (temp),
-                      _("File size: %02.01f kB"),
-                      (gdouble) (buf.st_size) / 1024.0);
-          gtk_label_set_text (GTK_LABEL (preview_size), temp);
+
+          size_text = g_format_size_for_display (buf.st_size);
+          text = g_strdup_printf (_("File size: %s"), size_text);
+
+          gtk_label_set_text (GTK_LABEL (preview_size), text);
+
+          g_free (text);
+          g_free (size_text);
 
           /* and load the preview */
           load_image (pp->file_name, GIMP_RUN_NONINTERACTIVE, TRUE, NULL);

gimp-2.6.2-xdg-open.patch:

--- NEW FILE gimp-2.6.2-xdg-open.patch ---
diff -up gimp-2.6.2/app/config/gimpguiconfig.c.xdg-open gimp-2.6.2/app/config/gimpguiconfig.c
--- gimp-2.6.2/app/config/gimpguiconfig.c.xdg-open	2008-10-30 10:27:56.000000000 +0100
+++ gimp-2.6.2/app/config/gimpguiconfig.c	2008-10-31 11:25:54.000000000 +0100
@@ -45,7 +45,7 @@
 #elif PLATFORM_OSX
 #  define DEFAULT_WEB_BROWSER  "open %s"
 #else
-#  define DEFAULT_WEB_BROWSER  "firefox %s"
+#  define DEFAULT_WEB_BROWSER  "xdg-open %s"
 #endif
 
 
diff -up gimp-2.6.2/docs/gimprc.5.in.xdg-open gimp-2.6.2/docs/gimprc.5.in
--- gimp-2.6.2/docs/gimprc.5.in.xdg-open	2008-10-30 10:29:00.000000000 +0100
+++ gimp-2.6.2/docs/gimprc.5.in	2008-10-31 11:24:26.000000000 +0100
@@ -788,7 +788,7 @@ Sets the browser used by the help system
 web-browser.
 
 .TP
-(web-browser "firefox %s")
+(web-browser "xdg-open %s")
 
 Sets the external web browser to be used.  This can be an absolute path or the
 name of an executable to search for in the user's PATH. If the command
diff -up gimp-2.6.2/etc/gimprc.xdg-open gimp-2.6.2/etc/gimprc
--- gimp-2.6.2/etc/gimprc.xdg-open	2008-10-30 10:33:24.000000000 +0100
+++ gimp-2.6.2/etc/gimprc	2008-10-31 11:24:26.000000000 +0100
@@ -625,7 +625,7 @@
 # appended to the command with a space separating the two.  This is a single
 # filename.
 # 
-# (web-browser "firefox %s")
+# (web-browser "xdg-open %s")
 
 # When enabled, the online user manual will be used by the help system.
 # Otherwise the locally installed copy is used.  Possible values are yes and


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	22 Aug 2008 17:16:05 -0000	1.43
+++ .cvsignore	11 Nov 2008 13:09:03 -0000	1.44
@@ -1 +1 @@
-gimp-2.4.7.tar.bz2
+gimp-2.6.2.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/gimp.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- gimp.spec	17 Sep 2008 13:41:24 -0000	1.161
+++ gimp.spec	11 Nov 2008 13:09:04 -0000	1.162
@@ -3,70 +3,52 @@
 # package will be built:
 # 
 # modular_x:   modular X dependencies
+%bcond_without modular_x
 # lcms:        lcms support
+%bcond_without lcms
 # python:      python support
+%bcond_without python
 # mp:          multi processor support
+%bcond_without mp
 # static:      build static libraries
+%bcond_with static
 # print:       build the print plugin (if you don't build it externally)
+%bcond_without print
 # gutenprint:  require gutenprint-plugin (instead of gimp-print-plugin) if
 #              internal print plugin isn't built
-# convenience: install convenience symlinks
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-%bcond_without modular_x
-%bcond_without lcms
-%else
-%bcond_with modular_x
-%bcond_with lcms
-%endif
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
 %bcond_without gutenprint
-%bcond_without xdg_open
-%else
-%bcond_with gutenprint
-%bcond_with xdg_open
-%endif
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
-%bcond_without print
-%else
-%bcond_with print
-%endif
-
-%bcond_without python
-%bcond_without mp
+# convenience: install convenience symlinks
 %bcond_without convenience
-%bcond_with static
-
-#
-#
 
 Summary:        GNU Image Manipulation Program
 Name:           gimp
-Version:        2.4.7
-%define binver 2.4
+Version:        2.6.2
+%define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
-%define minorver 400
+%define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        3%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.gimp.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 Obsoletes:      gimp-perl < 2:2.0
+Obsoletes:      gimp < 2:2.6.0-3
 BuildRequires:  alsa-lib-devel >= 1.0.0
+BuildRequires:  babl-devel >= 0.0.22
+BuildRequires:  cairo-devel >= 1.4.10
 BuildRequires:  curl-devel >= 7.15.1
 BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  fontconfig-devel >= 2.2.0
 BuildRequires:  freetype-devel >= 2.1.7
-BuildRequires:  glib2-devel >= 2.12.3
+BuildRequires:  gegl-devel >= 0.0.18
+BuildRequires:  glib2-devel >= 2.16.1
 BuildRequires:  gnome-keyring-devel >= 0.4.5
 BuildRequires:  gnome-vfs2-devel >= 2.10.0
-BuildRequires:  gtk2-devel >= 2.10.13
+BuildRequires:  gtk2-devel >= 2.12.5
 BuildRequires:  gtk-doc >= 1.0
 BuildRequires:  gtkhtml2-devel >= 2.0.0
 BuildRequires:  hal-devel >= 0.5.7
@@ -78,11 +60,12 @@
 BuildRequires:  librsvg2-devel >= 2.14.0
 BuildRequires:  libtiff-devel
 BuildRequires:  libwmf-devel >= 0.2.8
-BuildRequires:  pango-devel >= 1.12.2
+BuildRequires:  pango-devel >= 1.18.0
 BuildRequires:  poppler-devel >= 0.4.1
 BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
+BuildRequires:  WebKit-gtk-devel >= 1.0.0
 %if %{with modular_x}
 BuildRequires:  libX11-devel
 BuildRequires:  libXmu-devel
@@ -94,14 +77,13 @@
 BuildRequires:  gettext
 BuildRequires:  findutils
 %if %{with lcms}
-BuildRequires:  lcms-devel
+BuildRequires:  lcms-devel >= 1.16
 %endif
 
 Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       desktop-file-utils >= 0.9
-Requires:       glib2 >= 2.12.3
-Requires:       gtk2 >= 2.10.13
-Requires:       pango >= 1.12.2
+Requires:       glib2 >= 2.16.1
+Requires:       gtk2 >= 2.12.5
+Requires:       pango >= 1.18.0
 Requires:       freetype >= 2.1.7
 Requires:       fontconfig >= 2.2.0
 %if ! %{with print}
@@ -111,19 +93,15 @@
 Requires:       gimp-print-plugin
 %endif
 %endif
-Requires(post): /usr/bin/update-desktop-database
-Requires(postun):   /usr/bin/update-desktop-database
 Requires:       hicolor-icon-theme
-%if %{with xdg_open}
 Requires:       xdg-utils
-%else
-Requires:       htmlview
-%endif
+Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       gimp-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Source1:        gimp-plugin-mgr.in
-Patch0:         gimp-2.4.0-htmlview.patch
-Patch1:         gimp-2.4.0-xdg-open.patch
+Patch0:         gimp-2.6.2-xdg-open.patch
+Patch1:         gimp-2.6.2-jpeg-units.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -158,6 +136,17 @@
 for writing GNU Image Manipulation Program (GIMP) plug-ins and
 extensions.
 
+%package help-browser
+Summary:        GIMP help browser plug-in
+Group:          Applications/Multimedia
+License:        GPLv2+
+Obsoletes:      gimp < 2:2.6.0-3
+Requires:       gimp-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description help-browser
+The gimp-help-browser package contains a lightweight help browser plugin for
+viewing GIMP online help.
+
 %prep
 cat << EOF
 
@@ -174,26 +163,21 @@
 prefer gutenprint over (external) gimp-print plugin:
                                           %{with gutenprint}
 %endif
-use xdg-open instead of htmlview:         %{with xdg_open}
 
 
 EOF
 
 %setup -q -n gimp-%{version}
-%if %{with xdg_open}
-%patch1 -p1 -b .xdg-open
-%else
-%patch0 -p1 -b .htmlview
-%endif
+%patch0 -p1 -b .xdg-open
+%patch1 -p1 -b .jpeg-units
 
 %build
 LIBAA="disable"; export LIBAA
 if [ ! -f configure ]; then
   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
 fi
-CFLAGS="%optflags -fomit-frame-pointer" \
 %configure \
-    --disable-perl \
+    --disable-perl --enable-gimp-remote \
 %if %{with python}
     --enable-python \
 %else
@@ -226,12 +210,12 @@
 %endif
     --with-libtiff --with-libjpeg --with-libpng --with-libmng --with-libexif \
     --with-gtkhtml2 --with-librsvg --with-poppler --with-gnomevfs --with-alsa \
-    --with-dbus --with-script-fu
+    --with-webkit --with-dbus --with-script-fu
 
 make %{?_smp_mflags}
 
 # convenience stuff for external plugins (e.g. xsane)
-sed -e 's|@GIMPTOOL@|%{_bindir}/gimptool-%{interfacever}|g' < %{SOURCE1} > gimp-plugin-mgr
+sed -e 's|@GIMPPLUGINDIR@|%{_libdir}/gimp/%{interfacever}|g' < %{SOURCE1} > gimp-plugin-mgr
 
 %install
 rm -rf %{buildroot}
@@ -309,7 +293,7 @@
 fi
 
 %post
-/usr/bin/update-desktop-database %{_datadir}/applications
+/usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -325,7 +309,7 @@
 
 %postun
 if [ "$1" = "0" ]; then
-    /usr/bin/update-desktop-database %{_datadir}/applications || :
+    /usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
 fi
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -340,8 +324,6 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc docs/*.xcf*
 %{_datadir}/applications/*.desktop
-%{_datadir}/application-registry/*.applications
-%{_datadir}/mime-info/*.keys
 
 %dir %{_datadir}/gimp
 %dir %{_datadir}/gimp/%{interfacever}
@@ -353,6 +335,7 @@
 #%dir %{_libdir}/gimp/%{interfacever}/fonts
 %dir %{_libdir}/gimp/%{interfacever}/modules
 %dir %{_libdir}/gimp/%{interfacever}/plug-ins
+%exclude %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 %dir %{_libdir}/gimp/%{interfacever}/python
 #%dir %{_libdir}/gimp/%{interfacever}/tool-plug-ins
 
@@ -383,27 +366,23 @@
 
 %{_bindir}/gimp-%{binver}
 %{_bindir}/gimp-remote-%{binver}
-%{_bindir}/gimptool-%{interfacever}
 %{_bindir}/gimp-console-%{binver}
 %{_sbindir}/gimp-plugin-mgr
 
 %if %{with convenience}
 %{_bindir}/gimp
 %{_bindir}/gimp-remote
-%{_bindir}/gimptool
 %{_bindir}/gimp-console
 %endif
 
 %{_mandir}/man1/gimp-%{binver}.1*
 %{_mandir}/man1/gimp-remote-%{binver}.1*
-%{_mandir}/man1/gimptool-%{interfacever}.1*
 %{_mandir}/man1/gimp-console-%{binver}.1*
 %{_mandir}/man5/gimprc-%{binver}.5*
 
 %if %{with convenience}
 %{_mandir}/man1/gimp.1*
 %{_mandir}/man1/gimp-remote.1*
-%{_mandir}/man1/gimptool.1*
 %{_mandir}/man1/gimp-console.1*
 %{_mandir}/man5/gimprc.5*
 %endif
@@ -441,6 +420,14 @@
 %doc HACKING README.i18n
 %doc %{_datadir}/gtk-doc/*
 
+%{_bindir}/gimptool-%{interfacever}
+%{_mandir}/man1/gimptool-%{interfacever}.1*
+
+%if %{with convenience}
+%{_bindir}/gimptool
+%{_mandir}/man1/gimptool.1*
+%endif
+
 %{_libdir}/*.so
 %dir %{_libdir}/gimp
 %dir %{_libdir}/gimp/%{interfacever}
@@ -453,7 +440,105 @@
 %{_includedir}/gimp-%{interfacever}
 %{_libdir}/pkgconfig/*
 
+%files help-browser
+%defattr (-, root, root, 0755)
+%{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
+
 %changelog
+* Tue Nov 11 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.2-2
+- backport: use size units in JPEG save preview (#469551)
+
+* Fri Oct 31 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.2-1
+- version 2.6.2
+- update xdg-open patch
+
+  Overview of Changes from GIMP 2.6.1 to GIMP 2.6.2
+  =================================================
+
+  * Bugs fixed:
+
+   557950 â€“ Scaling in Gimp 2.6 is much slower than in Gimp 2.4
+   558215 â€“ unit and zoom entries in Statusbar not visible
+   558451 â€“ Cannot build GIMP using Sun CC on Solaris 2.8
+   558420 â€“ projection incorrect with alpha-less layers
+   556603 â€“ Zoom region always zooms in center of image
+   557870 â€“ "Qmask" message popping up here and there
+   557705 â€“ compatibility with GEGL > 0.0.20
+   556248 â€“ Scaling gives 'jagged' edges
+   556804 â€“ Zoom drop down doesn't update
+   524615 â€“ Print not to scale
+   555246 â€“ gimp crashes when a file is opened while a preview is generating
+   556741 â€“ Alpha layer automatically added (in psd format)
+   556182 â€“ Could you please explain a few strings [I18N]
+   555697 â€“ build fails if configured with --without-libjpeg
+   134956 â€“ Curves tool doesn't save free curves
+
+  * Updated translations:
+
+   Czech (cs)
+   Danish (da)
+   Finnish (fi)
+   French (fr)
+   Japanese (ja)
+   Polish (pl)
+   Brazilian Portuguese (pt_BR)
+   Swedish (sv)
+   Simplified Chinese (zh_CN)
+
+* Tue Oct 28 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.1-2
+- update required versions of some packages (#467065)
+
+* Fri Oct 10 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.1-1
+- version 2.6.1
+
+  Overview of Changes from GIMP 2.6.0 to GIMP 2.6.1
+  =================================================
+
+  * Bugs fixed:
+
+   555587 â€“ PSD file crashes PSD plug-in
+   555222 â€“ PSD Load Plugin: unsupported compression mode
+   555362 â€“ gimp-remote is not working properly
+   555280 â€“ some gif files will not be open
+   554890 â€“ JPEG Save Options Dialog does not remember
+   554966 â€“ Gimp crashes creating a new image using a template
+   554785 â€“ Compile failure on uri-backend-libcurl
+   554646 â€“ Opening Help crashes GIMP with lqr-plugin installed
+   553534 â€“ centering issues after image scaling and setting zoom
+   554898 â€“ Compile failure on uri-backend-wget.c
+
+  * Updated translations:
+
+   Belarusian (be)
+   Catalan (ca)
+   Finnish (fi)
+   French (fr)
+   Japanese (ja)
+   Macedonian (mk)
+   Punjab (pa)
+   Brazilian Portuguese (pt_BR)
+   Romanian (ro)
+   Slovenian (sl)
+   Swedish (sv)
+
+* Wed Oct 08 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.0-3
+- split off help browser plugin
+- let gimp and gimp-help-browser obsolete older gimp versions to allow seamless
+  upgrades
+
+* Tue Oct 07 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.0-2
+- move gimptool to devel subpackage
+- make gimp-plugin-mgr not require gimptool/pkg-config (#465869)
+
+* Thu Oct 02 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.0-1
+- version 2.6.0
+- remove obsolete htmlview patch
+- remove obsolete distro version dependent defaults
+- don't use custom CFLAGS
+
+* Mon Sep 22 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-4
+- don't require desktop-file-utils (#463049, patch by Ville SkyttÃ¤)
+
 * Wed Sep 17 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-3
 - don't make pyconsole.py plug-in executable as upstream indicates it shouldn't
   be


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-9/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	22 Aug 2008 17:16:05 -0000	1.43
+++ sources	11 Nov 2008 13:09:04 -0000	1.44
@@ -1 +1 @@
-8d0e059597d70fbdeb77e6447bae29c4  gimp-2.4.7.tar.bz2
+3664d12f26447c0edc3f611987b9bf2d  gimp-2.6.2.tar.bz2


--- gimp-2.4.0-htmlview.patch DELETED ---


--- gimp-2.4.0-xdg-open.patch DELETED ---


