Author: jsrain Date: Tue Oct 7 07:41:15 2008 New Revision: 51891 URL: http://svn.opensuse.org/viewcvs/yast?rev=51891&view=rev Log: Conflict with other branding providers (FATE#304881) Modified: trunk/branding/yast2-branding-SLED.changes trunk/branding/yast2-branding-SLED.spec trunk/branding/yast2-branding-SLES.changes trunk/branding/yast2-branding-SLES.spec trunk/branding/yast2-branding-openSUSE.changes trunk/branding/yast2-branding-openSUSE.spec Modified: trunk/branding/yast2-branding-SLED.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-SLED.changes?rev=51891&r1=51890&r2=51891&view=diff ============================================================================== --- trunk/branding/yast2-branding-SLED.changes (original) +++ trunk/branding/yast2-branding-SLED.changes Tue Oct 7 07:41:15 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 6 18:28:24 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- Tue Sep 30 12:16:12 CEST 2008 - jsrain@suse.cz - reduced BuildRequires Modified: trunk/branding/yast2-branding-SLED.spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-SLED.spec?rev=51891&r1=51890&r2=51891&view=diff ============================================================================== --- trunk/branding/yast2-branding-SLED.spec (original) +++ trunk/branding/yast2-branding-SLED.spec Tue Oct 7 07:41:15 2008 @@ -29,8 +29,7 @@ BuildRequires: yast2-devtools BuildArch: noarch Provides: yast2-branding -Conflicts: yast2-branding-openSUSE -Conflicts: yast2-branding-SLES +Conflicts: otherproviders(yast2-branding) Requires: yast2-theme-SLE Summary: SLED branding for YaST Modified: trunk/branding/yast2-branding-SLES.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-SLES.changes?rev=51891&r1=51890&r2=51891&view=diff ============================================================================== --- trunk/branding/yast2-branding-SLES.changes (original) +++ trunk/branding/yast2-branding-SLES.changes Tue Oct 7 07:41:15 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 6 18:28:24 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- Tue Sep 30 12:16:22 CEST 2008 - jsrain@suse.cz - reduced BuildRequires Modified: trunk/branding/yast2-branding-SLES.spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-SLES.spec?rev=51891&r1=51890&r2=51891&view=diff ============================================================================== --- trunk/branding/yast2-branding-SLES.spec (original) +++ trunk/branding/yast2-branding-SLES.spec Tue Oct 7 07:41:15 2008 @@ -29,8 +29,7 @@ BuildRequires: yast2-devtools BuildArch: noarch Provides: yast2-branding -Conflicts: yast2-branding-openSUSE -Conflicts: yast2-branding-SLED +Conflicts: otherproviders(yast2-branding) Requires: yast2-theme-SLE Summary: SLES branding for YaST Modified: trunk/branding/yast2-branding-openSUSE.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-openSUSE.changes?rev=51891&r1=51890&r2=51891&view=diff ============================================================================== --- trunk/branding/yast2-branding-openSUSE.changes (original) +++ trunk/branding/yast2-branding-openSUSE.changes Tue Oct 7 07:41:15 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Oct 6 18:28:24 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- Tue Sep 30 12:15:52 CEST 2008 - jsrain@suse.cz - reduced BuildRequires Modified: trunk/branding/yast2-branding-openSUSE.spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-openSUSE.spec?rev=51891&r1=51890&r2=51891&view=diff ============================================================================== --- trunk/branding/yast2-branding-openSUSE.spec (original) +++ trunk/branding/yast2-branding-openSUSE.spec Tue Oct 7 07:41:15 2008 @@ -29,8 +29,7 @@ BuildRequires: yast2-devtools BuildArch: noarch Provides: yast2-branding -Conflicts: yast2-branding-SLES -Conflicts: yast2-branding-SLED +Conflicts: otherproviders(yast2-branding) Requires: yast2-theme-openSUSE-any Summary: openSuSE branding for YaST -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org