diff --git a/gimp.changes b/gimp.changes index 92ebb8a..0c8f082 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 19 10:45:38 UTC 2013 - dimstar@opensuse.org + +- Drop branding-upstream subpackage: starting with openSUSE 13.1, + we will no longer replace the gimp splashcreen with a branded + version. This in order to maintain the identity of gimp. +- Remove gimp-branding Requires. +- Obsolete gimp-branding. + ------------------------------------------------------------------- Sat Jun 22 08:31:14 UTC 2013 - zaitor@opensuse.org diff --git a/gimp.spec b/gimp.spec index 4b5529a..16cd79e 100644 --- a/gimp.spec +++ b/gimp.spec @@ -81,11 +81,12 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.24.1 BuildRequires: pkgconfig(gudev-1.0) >= 167 BuildRequires: pkgconfig(pango) >= 1.29.4 BuildRequires: pkgconfig(xcursor) -Requires: %{name}-branding = %{version} Recommends: %{name}-help-browser Recommends: %{name}-lang Recommends: %{name}-plugins-python = %{version} Recommends: iso-codes +# With openSUSE 13.1, we started shipping gimp unbranded +Obsoletes: %{name}-branding Suggests: AdobeICCProfiles Suggests: gimp-2.0-scanner-plugin Provides: gimp-2.0 = %{version} @@ -144,37 +145,6 @@ distribute. 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} -Obsoletes: gimp-unstable-branding-upstream < 2.6.0 -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 -## 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 -#BRAND: starting" text and progress bar. -## WARNING WARNING WARNING: see warning in %%files section - -%description branding-upstream -The GIMP (GNU Image Manipulation Program) is a powerful image -composition and editing program, which can be extremely useful for -creating logos and other graphics for Web pages. The GIMP offers many -of the tools and filters you would expect to find in similar commercial -offerings and contains some interesting extras as well. The GIMP -provides a large image manipulation toolbox, including channel -operations and layers, effects, subpixel imaging and antialiasing, and -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 Summary: The GNU Image Manipulation Program - python-gtk based plugins Group: Productivity/Graphics/Bitmap Editors @@ -330,7 +300,7 @@ rm -rf %{buildroot} %{_datadir}/applications/gimp.desktop %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/gimp/ -%exclude %{_datadir}/gimp/2.0/images/gimp-splash.png +%{_datadir}/gimp/2.0/images/gimp-splash.png %{_libdir}/gimp/2.0/environ/default.env %{_libdir}/gimp/2.0/interpreters/default.interp # Explicitly list modules so we don't lose one by accident @@ -382,14 +352,6 @@ rm -rf %{buildroot} %doc AUTHORS COPYING ChangeLog LICENSE NEWS* README %{_libdir}/gimp/2.0/plug-ins/help-browser -%files branding-upstream -%defattr(-,root,root) -## WARNING WARNING WARNING: if we change the branding package to contain other -# files than the splash, and this means the branding package should have a real -# strict dependency on the gimp version, then branding-openSUSE should be -# changed. Right now it only has an unversioned Requires for the gimp. -%{_datadir}/gimp/2.0/images/gimp-splash.png - %files plugins-python -f plugins-python.list %defattr(-,root,root) %{_libdir}/gimp/2.0/environ/pygimp.env