diff --git a/.cvsignore b/.cvsignore index b1f3e5a..24aab94 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gimp-2.2.17.tar.bz2 +gimp-2.4.0-rc1.tar.bz2 diff --git a/gimp-2.0.1-gimphelpmissing.patch b/gimp-2.0.1-gimphelpmissing.patch deleted file mode 100644 index f44b195..0000000 --- a/gimp-2.0.1-gimphelpmissing.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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-2.0pre3-buildroot.patch b/gimp-2.0pre3-buildroot.patch deleted file mode 100644 index e751544..0000000 --- a/gimp-2.0pre3-buildroot.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gimp-2.0pre3/data/misc/Makefile.am.buildroot 2004-02-03 22:53:10.000000000 +0100 -+++ gimp-2.0pre3/data/misc/Makefile.am 2004-02-06 14:45:08.365249703 +0100 -@@ -28,18 +28,18 @@ - - install-data-local: - if DESKTOP_DATADIR -- if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \ -- cd $(DESTDIR)@DESKTOP_DATADIR@/applications \ -+ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/applications; then \ -+ cd $(DESTDIR)$(DESKTOP_DATADIR)/applications \ - && rm -f gimp-@GIMP_APP_VERSION@.desktop \ - && $(LN_S) $(miscdatadir)/gimp.desktop gimp-@GIMP_APP_VERSION@.desktop \ - ; fi -- if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \ -- cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \ -+ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/application-registry; then \ -+ cd $(DESTDIR)$(DESKTOP_DATADIR)/application-registry \ - && rm -f gimp-@GIMP_APP_VERSION@.applications \ - && $(LN_S) $(miscdatadir)/gimp.applications gimp-@GIMP_APP_VERSION@.applications \ - ; fi -- if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \ -- cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \ -+ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/mime-info; then \ -+ cd $(DESTDIR)$(DESKTOP_DATADIR)/mime-info \ - && rm -f gimp-@GIMP_APP_VERSION@.keys \ - && $(LN_S) $(miscdatadir)/gimp.keys gimp-@GIMP_APP_VERSION@.keys \ - ; fi -@@ -47,16 +47,16 @@ - - uninstall-local: - if DESKTOP_DATADIR -- if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \ -- cd $(DESTDIR)@DESKTOP_DATADIR@/applications \ -+ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/applications; then \ -+ cd $(DESTDIR)$(DESKTOP_DATADIR)/applications \ - && rm -f gimp-@GIMP_APP_VERSION@.desktop \ - ; fi -- if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \ -- cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \ -+ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/application-registry; then \ -+ cd $(DESTDIR)$(DESKTOP_DATADIR)/application-registry \ - && rm -f gimp-@GIMP_APP_VERSION@.applications \ - ; fi -- if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \ -- cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \ -+ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/mime-info; then \ -+ cd $(DESTDIR)$(DESKTOP_DATADIR)/mime-info \ - && rm -f gimp-@GIMP_APP_VERSION@.keys \ - ; fi - endif diff --git a/gimp-2.2.11-gimptool.patch b/gimp-2.2.11-gimptool.patch deleted file mode 100644 index 46c43d0..0000000 --- a/gimp-2.2.11-gimptool.patch +++ /dev/null @@ -1,163 +0,0 @@ ---- gimp-2.2.11/gimptool-2.0.in.gimptool 2006-01-10 13:12:28.000000000 +0100 -+++ gimp-2.2.11/gimptool-2.0.in 2006-04-20 14:45:18.000000000 +0200 -@@ -91,54 +91,60 @@ - usage 1 - fi - --if test x${PKG_CONFIG+set} != xset ; then -- PKG_CONFIG=pkg-config --fi -+__gimptool_init__=0 -+init() { -+ if [ "$__gimptool_init__" -eq 0 ]; then -+ if test x${PKG_CONFIG+set} != xset ; then -+ PKG_CONFIG=pkg-config -+ fi - --if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then -- gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0` -- gtk_libs=`$PKG_CONFIG --libs gtk+-2.0` -- glib_cflags=`$PKG_CONFIG --cflags glib-2.0` -- glib_libs=`$PKG_CONFIG --libs glib-2.0` --else -- echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2 -- gtk_cflags='@GTK_CFLAGS@' -- gtk_libs='@GTK_LIBS@' -- glib_cflags='@GLIB_CFLAGS@' -- glib_libs='@GLIB_LIBS@' --fi -+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then -+ gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0` -+ gtk_libs=`$PKG_CONFIG --libs gtk+-2.0` -+ glib_cflags=`$PKG_CONFIG --cflags glib-2.0` -+ glib_libs=`$PKG_CONFIG --libs glib-2.0` -+ else -+ echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2 -+ gtk_cflags='@GTK_CFLAGS@' -+ gtk_libs='@GTK_LIBS@' -+ glib_cflags='@GLIB_CFLAGS@' -+ glib_libs='@GLIB_LIBS@' -+ fi - --if test x${INSTALL+set} != xset ; then -- INSTALL='@INSTALL@' -- if test "$INSTALL" = "./install-sh -c"; then -- mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'` -- INSTALL="$mydirname/gimpinstall" -- fi --fi -+ if test x${INSTALL+set} != xset ; then -+ INSTALL='@INSTALL@' -+ if test "$INSTALL" = "./install-sh -c"; then -+ mydirname=`echo $0 | sed -e 's#\(.*\)/[^/].*$#\1#'` -+ INSTALL="$mydirname/gimpinstall" -+ fi -+ fi - --if test x${CC+set} != xset ; then -- cc='@CC@' --else -- cc="$CC" --fi -+ if test x${CC+set} != xset ; then -+ cc='@CC@' -+ else -+ cc="$CC" -+ fi - --if test x${CFLAGS+set} != xset ; then -- cflags='@CFLAGS@' --else -- cflags="$CFLAGS" --fi -+ if test x${CFLAGS+set} != xset ; then -+ cflags='@CFLAGS@' -+ else -+ cflags="$CFLAGS" -+ fi - --if test x${LDFLAGS+set} != xset ; then -- ldflags='@LDFLAGS@' --else -- ldflags="$LDFLAGS" --fi -+ if test x${LDFLAGS+set} != xset ; then -+ ldflags='@LDFLAGS@' -+ else -+ ldflags="$LDFLAGS" -+ fi - --if test x${LIBS+set} != xset ; then -- libs="" --else -- libs="$LIBS" --fi -+ if test x${LIBS+set} != xset ; then -+ libs="" -+ else -+ libs="$LIBS" -+ fi -+ __gimptool_init__=1 -+ fi -+} - - while test $# -gt 0; do - case "$1" in -@@ -174,9 +180,17 @@ - exec_prefix_set=yes - ;; - --exec-prefix) -+ init - echo $exec_prefix - ;; - --*dir) -+ case "$1" in -+ --gimp*dir) -+ ;; -+ *) -+ init -+ ;; -+ esac - dirname=\$`echo $1 | sed -e 's,^--,,'` - dirname=`eval echo $dirname` - test -z "$dirname" && exit 1 -@@ -184,6 +198,7 @@ - exit 0 - ;; - --cflags | --cflags-noui | --cflags-nogimpui) -+ init - case $1 in - --cflags | --cflags-nogimpui) - my_gtk_cflags=$gtk_cflags ;; -@@ -194,6 +209,7 @@ - echo $includes $my_gtk_cflags - ;; - --libs | --libs-nogimpui) -+ init - my_gtk_libs= - libdirs=-L@libdir@ - for i in $gtk_libs ; do -@@ -213,6 +229,7 @@ - esac - ;; - --libs-noui) -+ init - echo -L@libdir@ -lgimp-@GIMP_API_VERSION@ -lgimpcolor-@GIMP_API_VERSION@ -lgimpmath-@GIMP_API_VERSION@ -lgimpbase-@GIMP_API_VERSION@ $glib_libs $rt_libs - ;; - --install-bin | --install-admin-bin \ -@@ -220,6 +237,7 @@ - | --install-script | --install-admin-script \ - | --uninstall-bin | --uninstall-admin-bin \ - | --uninstall-script | --uninstall-admin-script ) -+ init - case $1 in - --*install-bin) - install_cmd="@INSTALL_PROGRAM@" -@@ -292,6 +310,7 @@ - | --install-nogimpui-strip | --install-admin-nogimpui-strip \ - | --build-noui | --install-noui | --install-admin-noui \ - | --build-noui-strip | --install-noui-strip | --install-admin-noui-strip) -+ init - opt=`echo $1 | sed 's/-strip$//'` - if test "x$opt" != "x$1" ; then - cflags=`echo $cflags | sed -e 's/-g //g' -e 's/ -g//g'` diff --git a/gimp-2.2.3-icontheme.patch b/gimp-2.2.3-icontheme.patch deleted file mode 100644 index 0986efb..0000000 --- a/gimp-2.2.3-icontheme.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gimp-2.2.3/data/misc/gimp.desktop.in.in.icontheme 2004-08-09 13:04:42.000000000 +0200 -+++ gimp-2.2.3/data/misc/gimp.desktop.in.in 2005-01-29 11:51:03.516250095 +0100 -@@ -7,7 +7,7 @@ - _Comment=Create and edit images or photographs - Exec=gimp-remote-@GIMP_APP_VERSION@ %U - TryExec=gimp-@GIMP_APP_VERSION@ --Icon=@gimpdatadir@/images/@GIMP_DESKTOP_ICON@ -+Icon=gimp.png - Terminal=false - Categories=Application;Graphics;2DGraphics;RasterGraphics; - X-GNOME-Bugzilla-Bugzilla=GNOME diff --git a/gimp-2.2.4-gifload.patch b/gimp-2.2.4-gifload.patch deleted file mode 100644 index 9a2612f..0000000 --- a/gimp-2.2.4-gifload.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gimp-2.2.4/plug-ins/common/gifload.c.gifload 2005-03-09 17:58:41.526620378 +0100 -+++ gimp-2.2.4/plug-ins/common/gifload.c 2005-03-09 18:00:25.137414122 +0100 -@@ -823,7 +823,12 @@ - gboolean alpha_frame = FALSE; - static int previous_disposal; - -- -+ /* Guard against bogus frame size */ -+ if (len < 1 || height < 1) -+ { -+ g_message ("Bogus frame dimensions"); -+ return -1; -+ } - - /* - ** Initialize the Compression routines diff --git a/gimp-2.2.11-htmlview.patch b/gimp-2.3.18-htmlview.patch similarity index 53% rename from gimp-2.2.11-htmlview.patch rename to gimp-2.3.18-htmlview.patch index 0c747c8..7fd9bca 100644 --- a/gimp-2.2.11-htmlview.patch +++ b/gimp-2.3.18-htmlview.patch @@ -1,22 +1,22 @@ ---- gimp-2.2.11/app/config/gimpguiconfig.c.htmlview 2006-02-14 11:13:14.000000000 +0100 -+++ gimp-2.2.11/app/config/gimpguiconfig.c 2006-04-18 08:30:02.000000000 +0200 -@@ -43,7 +43,7 @@ - #ifdef G_OS_WIN32 - # define DEFAULT_WEB_BROWSER "not used on Windows" - #else --# define DEFAULT_WEB_BROWSER "mozilla %s" -+# define DEFAULT_WEB_BROWSER "htmlview %s" - #endif - - ---- gimp-2.2.11/etc/gimprc.htmlview 2006-04-13 14:08:54.000000000 +0200 -+++ gimp-2.2.11/etc/gimprc 2006-04-18 08:28:25.000000000 +0200 -@@ -585,7 +585,7 @@ +--- 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 "mozilla %s") +-# (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 + + diff --git a/gimp.spec b/gimp.spec index 4a728fe..1e69e3c 100644 --- a/gimp.spec +++ b/gimp.spec @@ -34,79 +34,81 @@ # # -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 rcver rc1 +%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: GPLv2+ -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: %{?rcver:0.%{rcver}}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 +BuildRequires: libX11-devel +BuildRequires: libXmu-devel %else -BuildRequires: xorg-x11-devel +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: 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_gutenprint -Requires: gutenprint-plugin +Requires: gutenprint-plugin %else -Requires: gimp-print-plugin +Requires: gimp-print-plugin %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(postun): hicolor-icon-theme +Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?rcver:testing/}gimp-%{version}%{?rcver:-%{rcver}}.tar.bz2 +Source1: gimp-plugin-mgr.in +Patch0: gimp-2.3.18-htmlview.patch %description GIMP (GNU Image Manipulation Program) is a powerful image composition and @@ -118,23 +120,23 @@ and layers, effects, sub-pixel imaging and anti-aliasing, and conversions, all with multi-level undo. %package libs -Summary: GIMP libraries -Group: System Environment/Libraries -License: LGPLv2+ +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 -License: LGPLv2+ -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 @@ -156,21 +158,10 @@ include convenience symlinks: %_enable_convenience 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 +%setup -q -n gimp-%{version}%{?rcver:-%{rcver}} +%patch0 -p1 -b .htmlview %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} @@ -194,16 +185,23 @@ CFLAGS="%optflags -fomit-frame-pointer" \ --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} @@ -211,35 +209,27 @@ make %{?_smp_mflags} 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 # @@ -249,7 +239,10 @@ done >> gimp-plugin-files %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. @@ -258,12 +251,15 @@ cat gimp-plugin-files gimp-all.lang > gimp.files %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) @@ -272,7 +268,7 @@ mkdir -p %{buildroot}%{_sbindir} 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 @@ -298,11 +294,11 @@ fi %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 + gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : fi %post libs -p /sbin/ldconfig @@ -311,9 +307,7 @@ fi %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 @@ -321,7 +315,6 @@ fi %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} @@ -350,42 +343,42 @@ fi %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) @@ -395,6 +388,8 @@ fi %{_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} @@ -408,7 +403,7 @@ fi %files devel %defattr (-, root, root, 0755) -%doc HACKING +%doc HACKING README.i18n %doc %{_datadir}/gtk-doc/* %{_libdir}/*.so @@ -427,7 +422,20 @@ fi %changelog * Thu Aug 16 2007 Nils Philippsen +- 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 - 2:2.2.17-1 - version 2.2.17 diff --git a/sources b/sources index 329e75c..d81577c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f509ed4a605452d88e04045ff388d58 gimp-2.2.17.tar.bz2 +788fb85712ea1d8b52d70f7b2ebdb439 gimp-2.4.0-rc1.tar.bz2