Accepting request 87618 from GNOME:Apps

Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/87618
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=69

gimp.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 12 15:26:00 UTC 2011 - vuntz@opensuse.org
+
+- Add a warning comment about changing the content of the branding
+  package, to make our life easier in branding-openSUSE.
+
 -------------------------------------------------------------------
 Thu Oct  6 21:57:36 UTC 2011 - vuntz@opensuse.org
 

gimp.spec

@@ -152,9 +152,11 @@ 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
+## 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
@@ -409,6 +411,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %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