rpms/gimp/F-8 gimp-2.4.0-xdg-open.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 gimp.spec, 1.142, 1.143 sources, 1.35, 1.36
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Wed Oct 24 08:53:48 UTC 2007
Author: nphilipp
Update of /cvs/pkgs/rpms/gimp/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19267
Modified Files:
.cvsignore gimp.spec sources
Added Files:
gimp-2.4.0-xdg-open.patch
Log Message:
version 2.4.0
use xdg-open instead of htmlview on Fedora 7 and later
change hicolor-icon-theme requirement to be "uncolored" (without "(post)"/"(postun)")
don't let gtk-update-icon-cache fail scriptlets
gimp-2.4.0-xdg-open.patch:
--- NEW FILE gimp-2.4.0-xdg-open.patch ---
diff -up gimp-2.4.0/app/config/gimpguiconfig.c.xdg-open gimp-2.4.0/app/config/gimpguiconfig.c
--- gimp-2.4.0/app/config/gimpguiconfig.c.xdg-open 2007-05-21 10:56:29.000000000 +0200
+++ gimp-2.4.0/app/config/gimpguiconfig.c 2007-10-24 10:43:49.000000000 +0200
@@ -40,7 +40,7 @@
#ifdef G_OS_WIN32
# define DEFAULT_WEB_BROWSER "not used on Windows"
#else
-# define DEFAULT_WEB_BROWSER "firefox %s"
+# define DEFAULT_WEB_BROWSER "xdg-open %s"
#endif
diff -up gimp-2.4.0/etc/gimprc.xdg-open gimp-2.4.0/etc/gimprc
--- gimp-2.4.0/etc/gimprc.xdg-open 2007-10-22 21:45:59.000000000 +0200
+++ gimp-2.4.0/etc/gimprc 2007-10-24 10:43:58.000000000 +0200
@@ -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")
# The window type hint that is set on the toolbox. This may affect how your
# window manager decorates and handles the toolbox window. Possible values
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-8/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 27 Sep 2007 13:25:02 -0000 1.35
+++ .cvsignore 24 Oct 2007 08:53:15 -0000 1.36
@@ -1 +1 @@
-gimp-2.4.0-rc3.tar.bz2
+gimp-2.4.0.tar.bz2
Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-8/gimp.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- gimp.spec 12 Oct 2007 12:42:49 -0000 1.142
+++ gimp.spec 24 Oct 2007 08:53:15 -0000 1.143
@@ -22,8 +22,10 @@
%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
%define _enable_gutenprint 0%{!?_without_gutenprint:1}
+%define _enable_xdg_open 0%{!?_without_xdg_open:1}
%else
%define _enable_gutenprint 0%{?_with_gutenprint:1}
+%define _enable_xdg_open 0%{?_with_xdg_open:1}
%endif
%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
@@ -40,18 +42,16 @@
#
#
-
Summary: GNU Image Manipulation Program
Name: gimp
Version: 2.4.0
-%define rcver rc3
%define binver 2.4
%define gimp_lang_ver 20
%define interfacever 2.0
%define age 0
%define minorver 400
%define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: %{?rcver:0.%{rcver}.}2%{?dist}
+Release: 1%{?dist}
Epoch: 2
License: GPLv2+
Group: Applications/Multimedia
@@ -111,12 +111,18 @@
%endif
%endif
Requires(post): /usr/bin/update-desktop-database
-Requires(post): hicolor-icon-theme
Requires(postun): /usr/bin/update-desktop-database
-Requires(postun): hicolor-icon-theme
-Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?rcver:testing/}gimp-%{version}%{?rcver:-%{rcver}}.tar.bz2
+Requires: hicolor-icon-theme
+%if %_enable_xdg_open
+Requires: xdg-utils
+%else
+Requires: htmlview
+%endif
+
+Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
Source1: gimp-plugin-mgr.in
Patch0: gimp-2.3.18-htmlview.patch
+Patch1: gimp-2.4.0-xdg-open.patch
%description
GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -166,8 +172,12 @@
EOF
-%setup -q -n gimp-%{version}%{?rcver:-%{rcver}}
+%setup -q -n gimp-%{version}
+%if %_enable_xdg_open
+%patch1 -p1 -b .xdg-open
+%else
%patch0 -p1 -b .htmlview
+%endif
%build
LIBAA="disable"; export LIBAA
@@ -288,8 +298,8 @@
%post
/usr/bin/update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# Then re-add the symlinks
%{_sbindir}/gimp-plugin-mgr --install '*' || :
@@ -305,8 +315,8 @@
/usr/bin/update-desktop-database %{_datadir}/applications || :
fi
touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%post libs -p /sbin/ldconfig
@@ -429,6 +439,13 @@
%{_libdir}/pkgconfig/*
%changelog
+* Wed Oct 24 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-1
+- version 2.4.0
+- use xdg-open instead of htmlview on Fedora 7 and later
+- change hicolor-icon-theme requirement to be "uncolored" (without
+ "(post)"/"(postun)")
+- don't let gtk-update-icon-cache fail scriptlets
+
* Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc3.2
- build internal print plugin, don't require external print plugins on Fedora 8
and later
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-8/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 27 Sep 2007 13:25:02 -0000 1.35
+++ sources 24 Oct 2007 08:53:15 -0000 1.36
@@ -1 +1 @@
-f468ce7c1e3ead678f41b10b28200e60 gimp-2.4.0-rc3.tar.bz2
+35fecf14cd5237065aef624b93030d5e gimp-2.4.0.tar.bz2
More information about the fedora-extras-commits
mailing list