summaryrefslogtreecommitdiff
path: root/firefox.spec
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2012-08-27 16:09:25 +0200
committerMartin Stransky <stransky@redhat.com>2012-08-27 16:09:25 +0200
commitca09a5de99e7e63069d25d239f4f8d856b3e0014 (patch)
treefc2fb3c88a6401e312535000e0578bab959485a0 /firefox.spec
parentUpdate to 15.0 (diff)
parentUpdate to 15.0 (diff)
downloadlibrewolf-fedora-ff-ca09a5de99e7e63069d25d239f4f8d856b3e0014.tar.gz
librewolf-fedora-ff-ca09a5de99e7e63069d25d239f4f8d856b3e0014.tar.bz2
librewolf-fedora-ff-ca09a5de99e7e63069d25d239f4f8d856b3e0014.zip
merge fixes
Diffstat (limited to 'firefox.spec')
-rw-r--r--firefox.spec5
1 files changed, 5 insertions, 0 deletions
diff --git a/firefox.spec b/firefox.spec
index 02943e9..b117886 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -79,6 +79,7 @@ Patch14: firefox-5.0-asciidel.patch
Patch15: firefox-15.0-enable-addons.patch
# Upstream patches
+Patch20: mozilla-750620.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -123,6 +124,7 @@ cd %{tarballdir}
%patch15 -p2 -b .addons
# Upstream patches
+%patch20 -p1 -b .750620
%if %{official_branding}
# Required by Mozilla Corporation
@@ -397,6 +399,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Mon Aug 27 2012 Martin Stransky <stransky@redhat.com> - 15.0-1
- Update to 15.0
+* Wed Aug 22 2012 Dan HorĂ¡k <dan[at]danny.cz> - 14.0.1-3
+- add fix for secondary arches from xulrunner
+
* Wed Aug 1 2012 Martin Stransky <stransky@redhat.com> - 14.0.1-2
- removed StartupWMClass (rhbz#844860)
bgstack15