MozillaFirefox/MozillaFirefox.spec
branchfirefox20
changeset 639 0cb8814119b0
parent 633 7c6f56a37ed6
child 640 68ead6c93b7d
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Mar 19 09:17:51 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Apr 02 23:22:28 2013 +0200
@@ -17,9 +17,9 @@
 #
 
 
-%define major 19
-%define mainver %major.99
-%define update_channel beta
+%define major 20
+%define mainver %major.0
+%define update_channel release
 
 %if %suse_version > 1220
 %define gstreamer_ver 1.0
@@ -60,7 +60,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013031500
+%define         releasedate 2013032900
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -117,6 +117,7 @@
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
 Requires:       %{name}-branding > 4.0
+Conflicts:      %{name}-branding > %{version}
 Requires:       mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
 Requires:       mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
 Recommends:     libcanberra0