rpms/gimp/F-7 gimp-2.3.18-htmlview.patch, NONE, 1.1 gimp-2.4.0-xdg-open.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 gimp.spec, 1.131, 1.132 sources, 1.32, 1.33 gimp-2.0.1-gimphelpmissing.patch, 1.1, NONE gimp-2.0pre3-buildroot.patch, 1.1, NONE gimp-2.2.11-gimptool.patch, 1.1, NONE gimp-2.2.11-htmlview.patch, 1.1, NONE gimp-2.2.3-icontheme.patch, 1.1, NONE gimp-2.2.4-gifload.patch, 1.1, NONE
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Wed Oct 24 13:15:24 UTC 2007
Author: nphilipp
Update of /cvs/pkgs/rpms/gimp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3699
Modified Files:
.cvsignore gimp.spec sources
Added Files:
gimp-2.3.18-htmlview.patch gimp-2.4.0-xdg-open.patch
Removed Files:
gimp-2.0.1-gimphelpmissing.patch gimp-2.0pre3-buildroot.patch
gimp-2.2.11-gimptool.patch gimp-2.2.11-htmlview.patch
gimp-2.2.3-icontheme.patch gimp-2.2.4-gifload.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
build internal print plugin, don't require external print plugins on Fedora 8 and later
change license tags to GPLv2+ (main app), LGPLv2+ (libs and devel)
drop libXt-devel build requirement
build-require pygobject2-devel directly
don't let %postun fail
remove obsolete buildroot, gimphelpmissing, icontheme, gifload, gimptool patches
use more distinct build root
use %buildroot consistently
explicitely enable configure options
more versionized build requirements
don't rebuild autofoo files
reformat spec file a bit
gimp-2.3.18-htmlview.patch:
--- NEW FILE gimp-2.3.18-htmlview.patch ---
--- gimp-2.3.18/etc/gimprc.htmlview 2007-06-11 22:40:08.000000000 +0200
+++ gimp-2.3.18/etc/gimprc 2007-06-25 16:14:06.000000000 +0200
@@ -618,7 +618,7 @@
# appended to the command with a space separating the two. This is a single
# filename.
#
-# (web-browser "firefox %s")
+# (web-browser "htmlview %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
--- gimp-2.3.18/app/config/gimpguiconfig.c.htmlview 2007-05-21 10:56:29.000000000 +0200
+++ gimp-2.3.18/app/config/gimpguiconfig.c 2007-06-25 16:13:28.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 "htmlview %s"
#endif
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-7/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 13 Jul 2007 12:49:46 -0000 1.32
+++ .cvsignore 24 Oct 2007 13:14:48 -0000 1.33
@@ -1 +1 @@
-gimp-2.2.17.tar.bz2
+gimp-2.4.0.tar.bz2
Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-7/gimp.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gimp.spec 13 Jul 2007 12:49:47 -0000 1.131
+++ gimp.spec 24 Oct 2007 13:14:48 -0000 1.132
@@ -4,7 +4,8 @@
#
# modular_x: modular X deps
# lcms: lcms support
-# gutenprint: gutenprint support (instead of gimp-print)
+# gutenprint: require gutenprint-plugin (instead of gimp-print-plugin) if
+# internal print plugin isn't built
# python: python support
# mp: multi processor support
# static: build static libraries
@@ -21,92 +22,107 @@
%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
+%define _enable_print 0%{?_without_print:1}
+%else
+%define _enable_print 0%{?_with_print:1}
%endif
%define _enable_python 0%{!?_without_python:1}
%define _enable_mp 0%{!?_without_mp:1}
%define _enable_static 0%{!?_without_static:1}
-%define _enable_print 0%{?_with_print:1}
%define _enable_convenience %{!?_without_convenience:1}
#
#
-Summary: GNU Image Manipulation Program
-Name: gimp
-Version: 2.2.17
-%define binver 2.2
+Summary: GNU Image Manipulation Program
+Name: gimp
+Version: 2.4.0
+%define binver 2.4
%define gimp_lang_ver 20
%define interfacever 2.0
%define age 0
-%define minorver 200
+%define minorver 400
%define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 1%{?dist}
-Epoch: 2
-License: GPL, LGPL
-Group: Applications/Multimedia
-URL: http://www.gimp.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Obsoletes: gimp2 gimp-beta <= %{version}
-Obsoletes: gimp-perl < 2:2.0
-BuildRequires: glib2-devel >= 2.4.8
-BuildRequires: gtk2-devel >= 2.4.14
-BuildRequires: pango-devel >= 1.6.0
-BuildRequires: fontconfig-devel >= 2.2.0
-BuildRequires: gtkhtml2-devel
-BuildRequires: python-devel
-BuildRequires: pygtk2-devel
-# cope with pygobject2/-devel being split off as well:
-BuildRequires: %{_libdir}/pkgconfig/pygobject-2.0.pc
-BuildRequires: librsvg2-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libtiff-devel
-BuildRequires: libpng-devel
-BuildRequires: libmng-devel
-BuildRequires: libexif-devel
+Release: 1%{?dist}
+Epoch: 2
+License: GPLv2+
+Group: Applications/Multimedia
+URL: http://www.gimp.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
+Obsoletes: gimp2 gimp-beta <= 2.4
+Obsoletes: gimp-perl < 2:2.0
+BuildRequires: alsa-lib-devel >= 1.0.0
+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: gnome-keyring-devel >= 0.4.5
+BuildRequires: gnome-vfs2-devel >= 2.10.0
+BuildRequires: gtk2-devel >= 2.10.13
+BuildRequires: gtk-doc >= 1.0
+BuildRequires: gtkhtml2-devel >= 2.0.0
+BuildRequires: hal-devel >= 0.5.7
+BuildRequires: libexif-devel >= 0.6.15
+BuildRequires: libgnomeui-devel >= 2.10.0
+BuildRequires: libjpeg-devel
+BuildRequires: libmng-devel
+BuildRequires: libpng-devel
+BuildRequires: librsvg2-devel >= 2.14.0
+BuildRequires: libtiff-devel
+BuildRequires: libwmf-devel >= 0.2.8
+BuildRequires: pango-devel >= 1.12.2
+BuildRequires: poppler-devel >= 0.4.1
+BuildRequires: python-devel
+BuildRequires: pygtk2-devel >= 2.10.4
+BuildRequires: pygobject2-devel
%if %_enable_modularX
-BuildRequires: libX11-devel
-BuildRequires: libXmu-devel
-# these are req's for libXmu but not yet required by libXmu-devel
-BuildRequires: libXt-devel
-%else
-BuildRequires: xorg-x11-devel
-%endif
-BuildRequires: automake >= 1.7
-BuildRequires: autoconf >= 2.54
-BuildRequires: libtool >= 1.5
-BuildRequires: sed
-BuildRequires: libwmf-devel >= 0.2.8
+BuildRequires: libX11-devel
+BuildRequires: libXmu-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
+BuildRequires: sed
BuildRequires: intltool
BuildRequires: gettext
BuildRequires: findutils
%if %_enable_lcms
-BuildRequires: lcms-devel
+BuildRequires: lcms-devel
%endif
-Requires: desktop-file-utils >= 0.9
-Requires: glib2 >= 2.4.8
-Requires: gtk2 >= 2.4.14
-Requires: pango >= 1.6.0
-Requires: fontconfig >= 2.2.0
+Requires: desktop-file-utils >= 0.9
+Requires: glib2 >= 2.12.3
+Requires: gtk2 >= 2.10.13
+Requires: pango >= 1.12.2
+Requires: freetype >= 2.1.7
+Requires: fontconfig >= 2.2.0
+%if ! %_enable_print
%if %_enable_gutenprint
-Requires: gutenprint-plugin
+Requires: gutenprint-plugin
%else
-Requires: gimp-print-plugin
+Requires: gimp-print-plugin
+%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}/gimp-%{version}.tar.bz2
-Source1: gimp-plugin-mgr.in
-Patch0: gimp-2.0pre3-buildroot.patch
-Patch1: gimp-2.0.1-gimphelpmissing.patch
-Patch2: gimp-2.2.3-icontheme.patch
-Patch4: gimp-2.2.4-gifload.patch
-Patch5: gimp-2.2.11-htmlview.patch
-Patch6: gimp-2.2.11-gimptool.patch
+Requires(postun): /usr/bin/update-desktop-database
+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
@@ -118,21 +134,23 @@
with multi-level undo.
%package libs
-Summary: GIMP libraries
-Group: System Environment/Libraries
+Summary: GIMP libraries
+Group: System Environment/Libraries
+License: LGPLv2+
%description libs
The gimp-libs package contains shared libraries needed for the GNU Image
Manipulation Program (GIMP).
%package devel
-Summary: GIMP plugin and extension development kit
-Group: Applications/Multimedia
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: gtk2-devel
-Requires: glib2-devel
-Requires: pkgconfig
-Obsoletes: gimp2-devel gimp-beta-devel <= %{version}
+Summary: GIMP plugin and extension development kit
+Group: Applications/Multimedia
+License: LGPLv2+
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: gtk2-devel
+Requires: glib2-devel
+Requires: pkgconfig
+Obsoletes: gimp2-devel gimp-beta-devel <= 2.4
%description devel
The gimp-devel package contains the static libraries and header files
@@ -155,20 +173,13 @@
EOF
%setup -q -n gimp-%{version}
-%patch0 -p1 -b .buildroot
-%patch1 -p1 -b .gimphelpmissing
-%patch2 -p1 -b .icontheme
-%patch4 -p1 -b .gifload
-%patch5 -p1 -b .htmlview
-%patch6 -p1 -b .gimptool
+%if %_enable_xdg_open
+%patch1 -p1 -b .xdg-open
+%else
+%patch0 -p1 -b .htmlview
+%endif
%build
-libtoolize --copy --force
-intltoolize --automake --copy --force
-aclocal -I m4macros
-#perl -pi -e 's/require +XML::Parser/;/g;' aclocal.m4
-automake
-autoconf
LIBAA="disable"; export LIBAA
if [ ! -f configure ]; then
./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
@@ -192,16 +203,23 @@
--disable-static \
%endif
%if %_enable_print
- --enable-print \
+ --with-print \
%else
- --disable-print \
+ --without-print \
%endif
%if %_enable_lcms
--with-lcms \
%else
--without-lcms \
%endif
-;
+ --enable-gimp-console \
+ --without-aa \
+%ifos linux
+ --with-linux-input \
+%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
make %{?_smp_mflags}
@@ -209,35 +227,27 @@
sed -e 's|@GIMPTOOL@|%{_bindir}/gimptool-%{interfacever}|g' < %{SOURCE1} > gimp-plugin-mgr
%install
-export PATH="$PATH:$PWD/bin"
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_infodir} $RPM_BUILD_ROOT/%{_includedir} \
- $RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir} \
- $RPM_BUILD_ROOT/%{_libdir}/gimp/%{interfacever}/plug-ins \
- $RPM_BUILD_ROOT/%{_datadir}/{applications,application-registry,mime-info,icons/hicolor/48x48/apps}
+rm -rf %{buildroot}
# makeinstall macro won't work here - libexec is overriden
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
%ifos linux
# remove .la files
find %buildroot -name \*.la -exec %__rm -f {} \;
%endif
-# symlink desktop icon
-ln -s ../../../../gimp/%{interfacever}/images/wilber-icon.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gimp.png
-
#
# Plugins and modules change often (grab the executeable ones)
#
echo "%defattr (-, root, root)" > gimp-plugin-files
-#find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{interfacever} -type f -exec file {} \; | grep -v perl | cut -d':' -f 1 | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v /usr/lib/gimp/%{interfacever}/modules/.*\.a$ >>gimp-plugin-files
-find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{interfacever} -type f | sed "s@^$RPM_BUILD_ROOT@@g" | egrep -v 'modules/.*\.a$|modules/.*\.la$' >>gimp-plugin-files
-grep "\.py$" gimp-plugin-files > gimp-plugin-files-py
+find %{buildroot}%{_libdir}/gimp/%{interfacever} -type f | sed "s@^%{buildroot}@@g" | egrep -v 'modules/.*\.a$|modules/.*\.la$' >>gimp-plugin-files
# .pyc and .pyo files don't exist yet
+grep "\.py$" gimp-plugin-files > gimp-plugin-files-py
for file in $(cat gimp-plugin-files-py); do
- echo ${file}c
- echo ${file}o
+ for newfile in ${file}c ${file}o; do
+ fgrep -q -x "$newfile" gimp-plugin-files || echo "$newfile"
+ done
done >> gimp-plugin-files
#
@@ -247,7 +257,10 @@
%find_lang gimp%{gimp_lang_ver}-std-plug-ins
%find_lang gimp%{gimp_lang_ver}-script-fu
%find_lang gimp%{gimp_lang_ver}-libgimp
-cat gimp%{gimp_lang_ver}.lang gimp%{gimp_lang_ver}-std-plug-ins.lang gimp%{gimp_lang_ver}-script-fu.lang gimp%{gimp_lang_ver}-libgimp.lang > gimp-all.lang
+%find_lang gimp%{gimp_lang_ver}-tips
+%find_lang gimp%{gimp_lang_ver}-python
+
+cat gimp%{gimp_lang_ver}.lang gimp%{gimp_lang_ver}-std-plug-ins.lang gimp%{gimp_lang_ver}-script-fu.lang gimp%{gimp_lang_ver}-libgimp.lang gimp%{gimp_lang_ver}-tips.lang gimp%{gimp_lang_ver}-python.lang > gimp-all.lang
#
# Build the master filelists generated from the above mess.
@@ -256,12 +269,15 @@
%if %_enable_convenience
# install convenience symlinks
-ln -snf gimp-%{binver} %{buildroot}/%{_bindir}/gimp
-ln -snf gimp-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimp.1
-ln -snf gimp-remote-%{binver} %{buildroot}/%{_bindir}/gimp-remote
-ln -snf gimp-remote-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimp-remote.1
-ln -snf gimptool-%{interfacever} %{buildroot}/%{_bindir}/gimptool
-ln -snf gimptool-%{interfacever}.1 %{buildroot}/%{_mandir}/man1/gimptool.1
+ln -snf gimp-%{binver} %{buildroot}%{_bindir}/gimp
+ln -snf gimp-%{binver}.1 %{buildroot}%{_mandir}/man1/gimp.1
+ln -snf gimp-console-%{binver} %{buildroot}/%{_bindir}/gimp-console
+ln -snf gimp-console-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimp-console.1
+ln -snf gimp-remote-%{binver} %{buildroot}%{_bindir}/gimp-remote
+ln -snf gimp-remote-%{binver}.1 %{buildroot}%{_mandir}/man1/gimp-remote.1
+ln -snf gimptool-%{interfacever} %{buildroot}%{_bindir}/gimptool
+ln -snf gimptool-%{interfacever}.1 %{buildroot}%{_mandir}/man1/gimptool.1
+ln -snf gimprc-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimprc.5
%endif
# convenience stuff for external plugins (e.g. xsane)
@@ -270,7 +286,7 @@
install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%pre
# First, remove old symlinks which are possibly in an old location (before a
@@ -282,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 '*' || :
@@ -296,11 +312,11 @@
%postun
if [ "$1" = "0" ]; then
- /usr/bin/update-desktop-database %{_datadir}/applications
+ /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
@@ -309,9 +325,7 @@
%files -f gimp.files
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING ChangeLog NEWS README
-%doc docs/*.txt docs/*.ps docs/*.xcf* docs/*.svg README.i18n README.win32
-#%attr(-,root,root) %config(missingok) /%{_datadir}/applications/gimp.desktop
-#%attr(-,root,root) %config(missingok) /%{_datadir}/mc/templates/gimp.desktop
+%doc docs/*.xcf*
%{_datadir}/applications/*.desktop
%{_datadir}/application-registry/*.applications
%{_datadir}/mime-info/*.keys
@@ -319,7 +333,6 @@
%dir %{_datadir}/gimp
%dir %{_datadir}/gimp/%{interfacever}
%{_datadir}/gimp/%{interfacever}/tips/
-%{_datadir}/gimp/%{interfacever}/misc/
%{_datadir}/gimp/%{interfacever}/menus/
%dir %{_libdir}/gimp
%dir %{_libdir}/gimp/%{interfacever}
@@ -348,42 +361,42 @@
%dir %{_sysconfdir}/gimp/%{interfacever}
%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/controllerrc
%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gimprc
-#%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gimprc_user
%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gtkrc
-#%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gtkrc_user
%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/unitrc
%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/ps-menurc
%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/sessionrc
%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/templaterc
-
-#%{_datadir}/locale/*/*/*
+%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/menurc
%{_bindir}/gimp-%{binver}
%{_bindir}/gimp-remote-%{binver}
%{_bindir}/gimptool-%{interfacever}
+%{_bindir}/gimp-console-%{binver}
%{_sbindir}/gimp-plugin-mgr
-#%{_bindir}/embedxpm
-#%{_bindir}/escputil-%{interfacever}
%if %_enable_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 %_enable_convenience
%{_mandir}/man1/gimp.1*
%{_mandir}/man1/gimp-remote.1*
%{_mandir}/man1/gimptool.1*
+%{_mandir}/man1/gimp-console.1*
%{_mandir}/man5/gimprc.5*
%endif
-%{_datadir}/icons/hicolor/48x48/apps/gimp.png
+%{_datadir}/icons/hicolor/*/apps/gimp.png
+%{_datadir}/icons/hicolor/scalable/apps/gimp.svg
%files libs
%defattr(-, root, root, 0755)
@@ -393,6 +406,8 @@
%{_libdir}/libgimpbase-%{interfacever}.so.%{age}
%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}.%{minorver}.%{microver}
%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}
+%{_libdir}/libgimpconfig-%{interfacever}.so.%{age}.%{minorver}.%{microver}
+%{_libdir}/libgimpconfig-%{interfacever}.so.%{age}
%{_libdir}/libgimpmath-%{interfacever}.so.%{age}.%{minorver}.%{microver}
%{_libdir}/libgimpmath-%{interfacever}.so.%{age}
%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}.%{minorver}.%{microver}
@@ -406,7 +421,7 @@
%files devel
%defattr (-, root, root, 0755)
-%doc HACKING
+%doc HACKING README.i18n
%doc %{_datadir}/gtk-doc/*
%{_libdir}/*.so
@@ -424,6 +439,42 @@
%{_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
+
+* Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc3.1
+- version 2.4.0-rc3
+
+* Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.2
+- rebuild to pick up new version of poppler
+
+* Tue Sep 04 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc2.1
+- version 2.4.0-rc2
+
+* Thu Aug 16 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc1.1
+- version 2.4.0-rc1
+- change license tags to GPLv2+ (main app), LGPLv2+ (libs and devel)
+- drop libXt-devel build requirement
+- build-require pygobject2-devel directly
+- don't let %%postun fail
+- remove obsolete buildroot, gimphelpmissing, icontheme, gifload, gimptool
+ patches
+- update htmlview patch
+- use more distinct build root
+- use %%buildroot consistently
+- explicitely enable configure options
+- more versionized build requirements
+- don't rebuild autofoo files
+- reformat spec file a bit
+
* Fri Jul 13 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.17-1
- version 2.2.17
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-7/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 13 Jul 2007 12:49:47 -0000 1.32
+++ sources 24 Oct 2007 13:14:48 -0000 1.33
@@ -1 +1 @@
-4f509ed4a605452d88e04045ff388d58 gimp-2.2.17.tar.bz2
+35fecf14cd5237065aef624b93030d5e gimp-2.4.0.tar.bz2
--- gimp-2.0.1-gimphelpmissing.patch DELETED ---
--- gimp-2.0pre3-buildroot.patch DELETED ---
--- gimp-2.2.11-gimptool.patch DELETED ---
--- gimp-2.2.11-htmlview.patch DELETED ---
--- gimp-2.2.3-icontheme.patch DELETED ---
--- gimp-2.2.4-gifload.patch DELETED ---
More information about the fedora-extras-commits
mailing list