Hello community, here is the log from the commit of package gimp for openSUSE:Factory checked in at 2012-09-15 17:27:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gimp (Old) and /work/SRC/openSUSE:Factory/.gimp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gimp", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gimp/gimp.changes 2012-06-26 15:37:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gimp.new/gimp.changes 2012-09-15 17:27:18.000000000 +0200 @@ -1,0 +2,37 @@ +Wed Aug 29 11:43:22 UTC 2012 - dimstar@opensuse.org + +- Update to version 2.8.2: + + Core: + - Make tag matching always case-insensitive + - Let the tile-cache-size default to half the physical memory + + GUI: + - Mention that the image was exported in the close warning + dialog + - Make sure popup windows appear on top on OSX + - Allow file opening by dropping to the OSX dock + - Fix the visibility logic of the export/overwrite menu items + - Remove all "Use GEGL" menu items, they only add bugs and zero + function + - Improve performance of display filters, especially color + management + - Fix the image window title to comply with the save/export + spec and use the same image name everywhere, not only in the + title + - Fix positioning of pasted/dropped stuff to be more reasonable + + Libgimp: + - Move gimpdir and thumbnails to proper locations on OSX + - Implement relocation on OSX + - Allow to use $(gimp_installation_dir) in config files + + Plug-ins: + - Fix remembering of JPEG load/save defaults + - Revive the page setup dialog on Windows + + Source and build system: + - Add Windows installer infrastructure + - Add infrastructure to build GIMP.app on OSX + + General: + - Lots of bug fixes + + Updated translations. +- Drop gimp-CVE-2012-3236.patch: fixed upstream. +- Clean spec-file using spec-cleaner. + +------------------------------------------------------------------- Old: ---- gimp-2.8.0.tar.bz2 gimp-CVE-2012-3236.patch New: ---- gimp-2.8.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp.spec ++++++ --- /var/tmp/diff_new_pack.xlulHB/_old 2012-09-15 17:27:21.000000000 +0200 +++ /var/tmp/diff_new_pack.xlulHB/_new 2012-09-15 17:27:21.000000000 +0200 @@ -20,11 +20,20 @@ %global apiver 2.0 Name: gimp +Version: 2.8.2 +Release: 0 +Summary: The GNU Image Manipulation Program +License: GPL-3.0+ +Group: Productivity/Graphics/Bitmap Editors +Url: http://www.gimp.org/ +Source: ftp://ftp.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2 +Source1: macros.gimp +# openSUSE palette file +Source2: openSUSE.gpl +Source99: baselibs.conf BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.0 BuildRequires: babl-devel >= 0.1.10 -BuildRequires: cairo-devel >= 1.10.2 -BuildRequires: dbus-1-glib-devel >= 0.70 BuildRequires: fdupes BuildRequires: fontconfig-devel >= 2.2.0 BuildRequires: gegl-devel >= 0.2.0 @@ -32,18 +41,20 @@ # Explicitly needed, otherwise ghostscript-mini is used during the # build, and it's not enough for gimp. BuildRequires: ghostscript-library -BuildRequires: glib2-devel >= 2.30.2 -BuildRequires: gtk2-devel >= 2.24.10 BuildRequires: intltool >= 0.40.1 BuildRequires: iso-codes-devel BuildRequires: libbz2-devel -BuildRequires: libexif-devel >= 0.6.15 BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: liblcms-devel >= 1.16 BuildRequires: libmng-devel BuildRequires: libpng-devel >= 1.2.37 BuildRequires: libpoppler-glib-devel >= 0.12.4 +BuildRequires: pkgconfig(cairo) >= 1.10.2 +BuildRequires: pkgconfig(dbus-glib-1) >= 0.70 +BuildRequires: pkgconfig(glib-2.0) >= 2.30.2 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10 +BuildRequires: pkgconfig(libexif) >= 0.6.15 %if 0%{?suse_version} < 1220 # best-effort attempt to use librsvg (file-svg plugin will be built # if recent-enough version of librsvg is there) @@ -59,7 +70,6 @@ %else BuildRequires: libxslt-tools %endif -BuildRequires: pango-devel >= 1.29.4 BuildRequires: python-gtk-devel >= 2.10.4 BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -69,23 +79,11 @@ BuildRequires: pkgconfig(atk) >= 2.2.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.24.1 BuildRequires: pkgconfig(gudev-1.0) >= 167 +BuildRequires: pkgconfig(pango) >= 1.29.4 BuildRequires: pkgconfig(xcursor) -Url: http://www.gimp.org/ -Version: 2.8.0 -Release: 0 -Summary: The GNU Image Manipulation Program -License: GPL-3.0+ -Group: Productivity/Graphics/Bitmap Editors -Source: ftp://ftp.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2 -Source1: macros.gimp -# openSUSE palette file -Source2: openSUSE.gpl -Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gimp-CVE-2012-3236.patch bnc#768376 bgo#676804 CVE-2012-3236 vuntz@opensuse.org -- Fix crash in file handling for fit files, taken from git -Patch0: gimp-CVE-2012-3236.patch Requires: %{name}-branding = %{version} -Recommends: %{name}-lang Recommends: %{name}-help-browser +Recommends: %{name}-lang Recommends: %{name}-plugins-python = %{version} Recommends: iso-codes Suggests: AdobeICCProfiles @@ -110,7 +108,6 @@ facility, but many of the included scripts rely on fonts that we cannot distribute. - %package -n libgimp-2_0-0 Summary: The GNU Image Manipulation Program - Libraries Group: Productivity/Graphics/Bitmap Editors @@ -129,7 +126,6 @@ This package provides GIMP libraries. - %package -n libgimpui-2_0-0 Summary: The GNU Image Manipulation Program - UI Libraries Group: Productivity/Graphics/Bitmap Editors @@ -148,18 +144,17 @@ This package provides GIMP UI libraries. - %package branding-upstream Summary: The GNU Image Manipulation Program -- Upstream Splash Screen Group: Productivity/Graphics/Bitmap Editors Requires: %{name} = %{version} +Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} -Conflicts: otherproviders(%{name}-branding) Obsoletes: gimp-unstable-branding-upstream < 2.6.0 -Supplements: packageand(%{name}:branding-upstream) +BuildArch: noarch +Conflicts: otherproviders(%{name}-branding) # It is technically compatible with 2.4, but upstream branding has version specific image: Conflicts: %{name} < 2.6.0 -BuildArch: noarch ## WARNING WARNING WARNING: see warning in %%files section #BRAND: /usr/share/gimp/2.0/images/gimp-splash.png is a splash screen in #BRAND: GIMP, original size is 300x400. Bottom part displays "just @@ -180,7 +175,6 @@ This package contains the upstream splash screen for the GIMP. - %package plugins-python Summary: The GNU Image Manipulation Program - python-gtk based plugins Group: Productivity/Graphics/Bitmap Editors @@ -205,7 +199,6 @@ facility, but many of the included scripts rely on fonts that we cannot distribute. - %package devel Summary: The GNU Image Manipulation Program Group: Productivity/Graphics/Bitmap Editors @@ -228,7 +221,6 @@ facility, but many of the included scripts rely on fonts that we cannot distribute. - %package help-browser Summary: The GNU Image Manipulation Program - Help Browser Group: Productivity/Graphics/Bitmap Editors @@ -238,7 +230,6 @@ %description help-browser This package contains the help browser for the GIMP. - %lang_package %prep %setup -q @@ -248,7 +239,6 @@ translation-update-upstream po-script-fu gimp20-script-fu translation-update-upstream po-plug-ins gimp20-std-plug-ins translation-update-upstream po-tips gimp20-tips -%patch0 -p1 # Safety check for ABI version change. vabi=`printf "%d" $(sed -n '/#define GIMP_MODULE_ABI_VERSION/{s/.* //;p}' libgimpmodule/gimpmodule.h)` if test "x${vabi}" != "x%{abiver}"; then @@ -265,19 +255,19 @@ fi %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure --with-pic\ --disable-static\ --libexecdir=%{_prefix}/lib\ --enable-default-binary\ --enable-mp -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall -install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/gimp/2.0/palettes +%make_install +install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/gimp/2.0/palettes %suse_update_desktop_file -N GIMP gimp -rm $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/*/*.*a +rm %{buildroot}%{_libdir}/gimp/2.0/*/*.*a %find_lang gimp20 %{?no_lang_C} %find_lang gimp20-libgimp %{?no_lang_C} gimp20.lang %find_lang gimp20-python %{?no_lang_C} gimp20.lang @@ -286,20 +276,20 @@ %find_lang gimp20-tips %{?no_lang_C} gimp20.lang echo "%%defattr(-,root,root)" >plugins.list echo "%%defattr(-,root,root)" >plugins-python.list -for PLUGIN in $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/plug-ins/* ; do +for PLUGIN in %{buildroot}%{_libdir}/gimp/2.0/plug-ins/* ; do if grep -q '^#!.*python' $PLUGIN ; then - echo "${PLUGIN#$RPM_BUILD_ROOT}" >>plugins-python.list + echo "${PLUGIN#%{buildroot}}" >>plugins-python.list else - echo "${PLUGIN#$RPM_BUILD_ROOT}" >>plugins.list + echo "${PLUGIN#%{buildroot}}" >>plugins.list fi done rm %{buildroot}%{_libdir}/*.la # Install the macros file: -install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm +install -d %{buildroot}%{_sysconfdir}/rpm sed -e "s/@GIMP_APIVER@/%{apiver}/;s/@GIMP_ABIVER@/%{abiver}/" \ < $RPM_SOURCE_DIR/macros.gimp > macros.gimp install -m 644 -c macros.gimp \ - $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.gimp + %{buildroot}%{_sysconfdir}/rpm/macros.gimp %fdupes %{buildroot}%{_datadir}/gtk-doc/ %fdupes %{buildroot}%{_libdir}/gimp/2.0/python/ %fdupes %{buildroot}%{_datadir}/gimp/2.0/ @@ -327,7 +317,7 @@ %postun -n libgimpui-2_0-0 -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f plugins.list %defattr(-,root,root) @@ -422,8 +412,7 @@ %{_libdir}/pkgconfig/gimpui-2.0.pc # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/* +%{_datadir}/gtk-doc/html/ %config %{_sysconfdir}/rpm/macros.gimp %changelog ++++++ gimp-2.8.0.tar.bz2 -> gimp-2.8.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/gimp/gimp-2.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.gimp.new/gimp-2.8.2.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org