summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@fedoraproject.org>2010-01-18 12:52:55 +0000
committerMartin Stransky <stransky@fedoraproject.org>2010-01-18 12:52:55 +0000
commite618b4061c078823b4e6ac8e7dab43989a99ca3d (patch)
treec253829e2f313222b7d12e4c7158f8c996525fae
parentUpdate to 3.6.1 RC2 (diff)
downloadlibrewolf-fedora-ff-e618b4061c078823b4e6ac8e7dab43989a99ca3d.tar.gz
librewolf-fedora-ff-e618b4061c078823b4e6ac8e7dab43989a99ca3d.tar.bz2
librewolf-fedora-ff-e618b4061c078823b4e6ac8e7dab43989a99ca3d.zip
Fix for #556428 - Restricted maximal xulrunner version
-rw-r--r--firefox.spec15
1 files changed, 9 insertions, 6 deletions
diff --git a/firefox.spec b/firefox.spec
index fbaed01..4cfb117 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -2,14 +2,15 @@
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
-%define mozappdir %{_libdir}/%{name}-%{internal_version}
-%define tarballdir mozilla-1.9.2
+%define mozappdir %{_libdir}/%{name}-%{internal_version}
+%define tarballdir mozilla-1.9.2
-%define xulrunner_version 1.9.2.1-0.10.rc1
-%define internal_version 3.6
+%define xulrunner_version 1.9.2.1-0.10.rc1
+%define xulrunner_version_max 1.9.3
+%define internal_version 3.6
-%define official_branding 0
-%define build_langpacks 1
+%define official_branding 0
+%define build_langpacks 1
%if ! %{official_branding}
%define cvsdate 20080327
@@ -62,6 +63,7 @@ BuildRequires: system-bookmarks
BuildRequires: xulrunner-devel >= %{xulrunner_version}
Requires: xulrunner >= %{xulrunner_version}
+Conflicts: xulrunner >= %{xulrunner_version_max}
Requires: system-bookmarks
Obsoletes: mozilla <= 37:1.7.13
Provides: webclient
@@ -348,6 +350,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Wed Jan 18 2010 Martin Stransky <stransky@redhat.com> - 3.6.1-0.11.rc2
- Update to 3.6.1 RC2
+- Fix for #556428 - Restricted maximal xulrunner version
* Wed Jan 13 2010 Martin Stransky <stransky@redhat.com> - 3.6.1-0.10.rc1
- Update to 3.6.1 RC1
bgstack15