Hello community, here is the log from the commit of package glib2-branding-openSUSE for openSUSE:Factory checked in at Mon Aug 9 15:20:42 CEST 2010. -------- --- GNOME/glib2-branding-openSUSE/glib2-branding-openSUSE.changes 2009-05-25 18:05:58.000000000 +0200 +++ glib2-branding-openSUSE/glib2-branding-openSUSE.changes 2010-07-22 13:29:40.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Jul 22 13:27:04 CEST 2010 - vuntz@opensuse.org + +- Add glib2 and glib2-branding-upstream BuildRequires, so we can + get the right version of glib2, which is needed to provide the + right version of glib2-branding. +- Bump version to 11.3. +- Change the order of the packageand() in Supplements to fix + rpmlint warnings. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.OEe69c/_old 2010-08-09 15:19:33.000000000 +0200 +++ /var/tmp/diff_new_pack.OEe69c/_new 2010-08-09 15:19:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package glib2-branding-openSUSE (Version 2.16) +# spec file for package glib2-branding-openSUSE (Version 11.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,21 @@ Name: glib2-branding-openSUSE -Version: 2.16 -Release: 49 +Version: 11.3 +Release: 1 Group: System/GUI/GNOME -License: BSD 3-Clause +License: BSD3c Summary: Definition of GNOME Default Applications Source: %{name}-gnome_defaults.conf Source1: %{name}-COPYING -Provides: glib2-branding = %{version} +# We need glib2-branding-upstream else, the call to SuSEconfig.glib2 fails +BuildRequires: glib2 +BuildRequires: glib2-branding-upstream +%define glib2_real_package %(rpm -q --whatprovides glib2) +%define glib2_version %(rpm -q --qf '%%{version}-%%{release}' %{glib2_real_package}) +Provides: glib2-branding = %{glib2_version} Conflicts: otherproviders(glib2-branding) -Supplements: packageand(branding-openSUSE:glib2) +Supplements: packageand(glib2:branding-openSUSE) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -39,12 +44,12 @@ %package -n glib2-branding-SLED -License: BSD 3-Clause +License: BSD3c Group: System/GUI/GNOME Summary: Definition of GNOME Default Applications -Provides: glib2-branding = %{version} +Provides: glib2-branding = %{glib2_version} Conflicts: otherproviders(glib2-branding) -Supplements: packageand(branding-SLED:glib2) +Supplements: packageand(glib2:branding-SLED) %description -n glib2-branding-SLED This branding-style package sets default applications in GNOME in @@ -53,12 +58,12 @@ %package -n glib2-branding-SLES -License: BSD 3-Clause +License: BSD3c Group: System/GUI/GNOME Summary: Definition of GNOME Default Applications -Provides: glib2-branding = %{version} +Provides: glib2-branding = %{glib2_version} Conflicts: otherproviders(glib2-branding) -Supplements: packageand(branding-SLES:glib2) +Supplements: packageand(glib2:branding-SLES) %description -n glib2-branding-SLES This branding-style package sets default applications in GNOME in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org