From 511999ab6a6f6cfb0ba97a98e1f9e8c1a3deaba87ee140485cbaacd1d88049d1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 6 Oct 2008 14:24:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=21 --- gimp-2.4.7.tar.bz2 | 3 --- gimp-2.6.0.tar.bz2 | 3 +++ gimp.changes | 14 ++++++++++++++ gimp.spec | 46 +++++++++++++++++++++++++++++----------------- 4 files changed, 46 insertions(+), 20 deletions(-) delete mode 100644 gimp-2.4.7.tar.bz2 create mode 100644 gimp-2.6.0.tar.bz2 diff --git a/gimp-2.4.7.tar.bz2 b/gimp-2.4.7.tar.bz2 deleted file mode 100644 index 53eeb4c..0000000 --- a/gimp-2.4.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d398eef058faf81053c624690ba3192a8d517b1370c6f35d10e0eae2190109c9 -size 18977384 diff --git a/gimp-2.6.0.tar.bz2 b/gimp-2.6.0.tar.bz2 new file mode 100644 index 0000000..69ed6ee --- /dev/null +++ b/gimp-2.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8 +size 15897821 diff --git a/gimp.changes b/gimp.changes index c00d294..8d7ed17 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Oct 6 15:06:38 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881, bnc#429324). + +------------------------------------------------------------------- +Thu Oct 2 11:47:37 CEST 2008 - sbrabec@suse.cz + +- Updated to version 2.6.0, the new stable branch: + * depends on GEGL and uses it optionally in some color operations + * UI refactoring + * many improvements and new features + * See NEWS for details. + ------------------------------------------------------------------- Thu Sep 4 13:04:15 CEST 2008 - sbrabec@suse.cz diff --git a/gimp.spec b/gimp.spec index 03f4ff4..8c1d77b 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,5 +1,5 @@ # -# spec file for package gimp (Version 2.4.7) +# spec file for package gimp (Version 2.6.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,19 +20,19 @@ Name: gimp #!BuildIgnore: sendmail -BuildRequires: aalib-devel alsa-devel cups cups-devel curl-devel dbus-1-glib-devel gnome-common gnutls-devel gtk-doc hal-devel intltool libexif-devel libgimpprint libgimpprint-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel liblcms-devel libmng-devel libpoppler-glib-devel librsvg-devel libtiff-devel libwmf-devel libwnck-devel perl-XML-Parser postfix python-devel python-gtk-devel slang-devel update-desktop-files +BuildRequires: aalib-devel alsa-devel cups cups-devel curl-devel dbus-1-glib-devel gegl-devel gnome-common gnutls-devel gtk-doc hal-devel intltool iso-codes-devel libexif-devel libgimpprint libgimpprint-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel liblcms-devel libmng-devel libpoppler-glib-devel librsvg-devel libtiff-devel libwebkit-devel libwmf-devel libwnck-devel perl-XML-Parser postfix python-devel python-gtk-devel slang-devel update-desktop-files Url: http://www.gimp.org/ -Version: 2.4.7 -Release: 11 +Version: 2.6.0 +Release: 1 License: GPL v2 or later Group: Productivity/Graphics/Bitmap Editors Suggests: AdobeICCProfiles -Provides: gimp-2.0 -Provides: gimp-unstable = %{version} -Obsoletes: gimp-unstable < 2.4.0 +Provides: gimp-2.0 = %{version} +Obsoletes: gimp-unstable < 2.6.0 Requires: %{name}-lang = %{version} +Requires: gtk2 >= 2.12.1 Summary: The GNU Image Manipulation Program -Source: ftp://ftp.gimp.org/pub/gimp/v2.4/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-branding >= 2.4 Recommends: %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin @@ -235,8 +235,11 @@ License: GPL v2 or later Summary: The GNU Image Manipulation Program Group: Productivity/Graphics/Bitmap Editors Provides: %{name}-branding = %{version} +Conflicts: otherproviders(%{name}-branding) +Obsoletes: gimp-unstable-branding-upstream < 2.6.0 Supplements: packageand(%{name}:branding-upstream) -Conflicts: %{name} < 2.4 +# It is technically compatible with 2.4, but upstream branding has version specific image: +Conflicts: %{name} < 2.6.0 #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 #BRAND: starting" text and progress bar. @@ -438,9 +441,12 @@ Authors: License: GPL v2 or later Summary: The GNU Image Manipulation Program - python-gtk based plugins Requires: %{name} = %{version} python-gtk -Provides: %{name}:%{_libdir}/gimp/2.0/plug-ins/pyconsole.py = %{version} Supplements: %{name} +Provides: gimp-2.0-plugins-python = %{version} +Obsoletes: gimp-unstable-plugins-python < 2.6.0 Group: Productivity/Graphics/Bitmap Editors +# For update from <= 10.3 and SLED 10: +Provides: %{name}:%{_libdir}/gimp/2.0/plug-ins/pyconsole.py = %{version} %description plugins-python The GIMP (GNU Image Manipulation Program) is a powerful image @@ -639,9 +645,8 @@ Authors: License: GPL v2 or later Summary: The GNU Image Manipulation Program Requires: %{name} = %{version} gtk2-devel glib2-devel glibc-devel -Provides: gimp-2.0-devel -Provides: gimp-unstable-devel = %{version} -Obsoletes: gimp-unstable-devel < 2.4.0 +Provides: gimp-2.0-devel = %{version} +Obsoletes: gimp-unstable-devel < 2.6.0 Group: Productivity/Graphics/Bitmap Editors %description devel @@ -841,9 +846,8 @@ Authors: License: GPL v2 or later Summary: The GNU Image Manipulation Program Requires: %{name} = %{version} -Provides: gimp-2.0-doc -Provides: gimp-unstable-doc = %{version} -Obsoletes: gimp-unstable-doc < 2.4.0 +Provides: gimp-2.0-doc = %{version} +Obsoletes: gimp-unstable-doc < 2.6.0 Group: Productivity/Graphics/Bitmap Editors %description doc @@ -1063,7 +1067,7 @@ make %{?jobs:-j%jobs} %install %makeinstall %suse_update_desktop_file gimp -rm $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/*/*.*a $RPM_BUILD_ROOT%{_datadir}/application-registry/gimp.applications $RPM_BUILD_ROOT%{_datadir}/mime-info/gimp.keys +rm $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/*/*.*a %find_lang gimp20 %find_lang gimp20-libgimp gimp20.lang %find_lang gimp20-python gimp20.lang @@ -1139,6 +1143,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Mon Oct 06 2008 sbrabec@suse.cz +- Conflict with other branding providers (FATE#304881, bnc#429324). +* Thu Oct 02 2008 sbrabec@suse.cz +- Updated to version 2.6.0, the new stable branch: + * depends on GEGL and uses it optionally in some color operations + * UI refactoring + * many improvements and new features + * See NEWS for details. * Thu Sep 04 2008 sbrabec@suse.cz - Recommend gimp-2.0-scanner-plugin (bnc#422558). * Fri Aug 22 2008 sbrabec@suse.cz