Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at Sun Oct 16 12:41:08 CEST 2011.
-------- --- openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2011-10-11 16:52:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes 2011-10-13 10:29:56.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Oct 13 08:29:25 UTC 2011 - [email protected] + +- let kdm-branding provide the same version as branding-upstream + +------------------------------------------------------------------- +Wed Oct 12 15:29:20 UTC 2011 - [email protected] + +- Change gimp-branding-openSUSE packaging to not depend on the gimp + version, so we don't have to rebuild the package when gimp + changes. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.SdCVMW/_old 2011-10-16 12:41:04.000000000 +0200 +++ /var/tmp/diff_new_pack.SdCVMW/_new 2011-10-16 12:41:04.000000000 +0200 @@ -36,7 +36,7 @@ %endif Summary: SuSE Brand File BuildRequires: fribidi -BuildRequires: kde4-filesystem kdelibs4-branding-upstream +BuildRequires: kde4-filesystem kdelibs4-branding-upstream kdm-branding-upstream BuildRequires: update-desktop-files %description @@ -155,7 +155,7 @@ Group: System/GUI/KDE PreReq: %fillup_prereq Supplements: packageand(kdm:branding-openSUSE) -Provides: kdm-branding = %{version} +Provides: kdm-branding = %( echo `rpm -q --provides kdm-branding-upstream | grep 'kdm-branding =' | cut -d= -f2` ) Provides: kde4-kdm-branding-openSUSE = %{version} Obsoletes: kde4-kdm-branding-openSUSE < %{version} Conflicts: otherproviders(kdm-branding) @@ -175,10 +175,17 @@ %package -n gimp-branding-openSUSE Group: Productivity/Graphics/Bitmap Editors Summary: The GNU Image Manipulation Program -- openSUSE Splash Screen +%if 0 +# Disabled since we want to avoid rebuilding this package when gimp changes. If +# we really need the strict versioned dependency, then re-enable this. BuildRequires: gimp %define gimp_version %(rpm -q --qf '%%{version}-%%{release}' gimp) Requires: gimp = %{gimp_version} Provides: gimp-branding = %{gimp_version} +%else +Requires: gimp +Provides: gimp-branding +%endif Conflicts: otherproviders(gimp-branding) Supplements: packageand(gimp:branding-openSUSE) BuildArch: noarch continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
