diff options
| author | Martin Stransky <stransky@anakreon.cz> | 2012-08-28 15:07:22 +0200 |
|---|---|---|
| committer | Martin Stransky <stransky@anakreon.cz> | 2012-08-28 15:07:22 +0200 |
| commit | 187b005f56a9d0133a3bc0f714e13fb78a8aac55 (patch) | |
| tree | 975039d83788bd19cbbdfdb3b27e411472197e4c /firefox.spec | |
| parent | Removed already applied patch (diff) | |
| download | librewolf-fedora-ff-187b005f56a9d0133a3bc0f714e13fb78a8aac55.tar.gz librewolf-fedora-ff-187b005f56a9d0133a3bc0f714e13fb78a8aac55.tar.bz2 librewolf-fedora-ff-187b005f56a9d0133a3bc0f714e13fb78a8aac55.zip | |
Added fix for rhbz#851722 - conflict with incompatible xulrunner
Diffstat (limited to 'firefox.spec')
| -rw-r--r-- | firefox.spec | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec index 0041177..9c62d73 100644 --- a/firefox.spec +++ b/firefox.spec @@ -17,6 +17,7 @@ %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global xulrunner_version 15.0 +%global xulrunner_version_max 15.1 %global xulrunner_release 1 %global alpha_version 0 %global beta_version 0 @@ -55,7 +56,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 15.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -100,6 +101,7 @@ Requires: xulrunner%{?_isa} >= %{xulrunner_verrel} Requires: system-bookmarks Obsoletes: mozilla <= 37:1.7.13 Provides: webclient +Conflicts: xulrunner%{?_isa} > %{xulrunner_version_max} %description 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 +* 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 - Update to 15.0 |