diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index c048020..fd2b3c2 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 6 14:56:31 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + ------------------------------------------------------------------- Fri Sep 26 18:22:01 CEST 2008 - vuntz@suse.de diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index dac40e0..bbc48c8 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -23,7 +23,7 @@ BuildRequires: MozillaFirefox Name: MozillaFirefox-branding-openSUSE License: BSD 3-Clause Version: 3.0.1 -Release: 11 +Release: 12 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers Source: %{name}-COPYING @@ -31,6 +31,7 @@ Source1: search-addons.tar.bz2 Source2: bookmarks.html.suse Source3: firefox-suse-default-prefs.js Provides: MozillaFirefox-branding = %{version} +Conflicts: otherproviders(MozillaFirefox-branding) Supplements: packageand(MozillaFirefox:branding-openSUSE) BuildRoot: %{_tmppath}/%{name}-%{version}-build %define default_home_page http://www.opensuse.org/ @@ -87,6 +88,8 @@ rm -rf $RPM_BUILD_ROOT %{progdir}/searchplugins/* %changelog +* Mon Oct 06 2008 sbrabec@suse.cz +- Conflict with other branding providers (FATE#304881). * Fri Sep 26 2008 vuntz@suse.de - Add COPYING file (bnc#426320). * Mon Aug 04 2008 wr@rosenauer.org