rpms/firefox
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Added fix for rhbz#851722 - conflict with incompatible xulrunner

Browse Source
This commit is contained in:
Martin Stransky 2012-08-28 15:07:22 +02:00
parent 5ddf79da3d
commit 187b005f56
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firefox.spec
View File

@ -17,6 +17,7 @@
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%global xulrunner_version 15.0 %global xulrunner_version 15.0
%global xulrunner_version_max 15.1
%global xulrunner_release 1 %global xulrunner_release 1
%global alpha_version 0 %global alpha_version 0
%global beta_version 0 %global beta_version 0
@ -55,7 +56,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 15.0 Version: 15.0
Release: 1%{?pre_tag}%{?dist} Release: 2%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -100,6 +101,7 @@ Requires: xulrunner%{?_isa} >= %{xulrunner_verrel}
Requires: system-bookmarks Requires: system-bookmarks
Obsoletes: mozilla <= 37:1.7.13 Obsoletes: mozilla <= 37:1.7.13
Provides: webclient Provides: webclient
Conflicts: xulrunner%{?_isa} > %{xulrunner_version_max}
%description %description
Mozilla Firefox is an open-source web browser, designed for standards Mozilla Firefox is an open-source web browser, designed for standards
@ -394,6 +396,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Aug 28 2012 Martin Stransky <stransky@redhat.com> - 15.0-2
- Added fix for rhbz#851722 - conflict with incompatible xulrunner
* Mon Aug 27 2012 Martin Stransky <stransky@redhat.com> - 15.0-1 * Mon Aug 27 2012 Martin Stransky <stransky@redhat.com> - 15.0-1
- Update to 15.0 - Update to 15.0