Accepting request 75685 from GNOME:Apps

Pushing bits of G:A

OBS-URL: https://build.opensuse.org/request/show/75685
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=62
This commit is contained in:
Sascha Peilicke 2011-07-08 07:34:23 +00:00 committed by Git OBS Bridge
parent 38bf913811
commit 5e190a54cc
2 changed files with 17 additions and 2 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jul 6 16:24:31 CEST 2011 - vuntz@opensuse.org
- Change branding-upstream subpackage:
+ Add Requires for gimp since the branding package is useless
without it.
+ Update summary and description.
+ Make noarch.
- Change branding Requires in main subpackage to be "= %{version}",
instead of ">= 2.4", which is wrong.
-------------------------------------------------------------------
Wed Jun 15 16:19:39 CEST 2011 - vuntz@opensuse.org

View File

@ -71,7 +71,7 @@ Patch0: gimp-CVE-2010-4540-and-more.patch
# PATCH-FIX-UPSTREAM gimp-CVE-2010-4543.patch CVE-2010-4543 bgo#639203 bnc#662043 vuntz@opensuse.org -- Fix a buffer overflow when reading a psp file
Patch1: gimp-CVE-2010-4543.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding >= 2.4
Requires: %{name}-branding = %{version}
Recommends: %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin %{name}-help-browser
Provides: gimp(api) = %{apiver} gimp(abi) = %{abiver}
%if ! %{build_hal}
@ -134,14 +134,16 @@ This package provides GIMP UI libraries.
%package branding-upstream
License: GPLv2+
Summary: The GNU Image Manipulation Program
Summary: The GNU Image Manipulation Program -- Upstream Splash Screen
Group: Productivity/Graphics/Bitmap Editors
Requires: %{name} = %{version}
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
Obsoletes: gimp-unstable-branding-upstream < 2.6.0
Supplements: packageand(%{name}:branding-upstream)
# It is technically compatible with 2.4, but upstream branding has version specific image:
Conflicts: %{name} < 2.6.0
BuildArch: noarch
#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.
@ -158,6 +160,8 @@ conversions- all including multilevel undo. The GIMP offers a scripting
facility, but many of the included scripts rely on fonts that we cannot
distribute.
This package contains the upstream splash screen for the GIMP.
%package plugins-python
License: GPLv2+