From 7fd17cbc7b69996503f89c1cbf0de71391692fa5 Mon Sep 17 00:00:00 2001
From: Petr Jašíček <pjasicek@redhat.com>
Date: Oct 15 2015 12:51:24 +0000
Subject: Merge branch 'master' into f21


---

diff --git a/firefox.desktop b/firefox.desktop
index 27c40bc..b394386 100644
--- a/firefox.desktop
+++ b/firefox.desktop
@@ -50,3 +50,13 @@ MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xm
 StartupNotify=true
 Categories=Network;WebBrowser;
 Keywords=web;browser;internet;
+Actions=new-window;new-private-window;
+
+[Desktop Action new-window]
+Name=Open a New Window
+Exec=firefox %u
+
+[Desktop Action new-private-window]
+Name=Open a New Private Window
+Exec=firefox --private-window %u
+
diff --git a/firefox.spec b/firefox.spec
index 0686317..43a5c77 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -86,7 +86,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        41.0.2
-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
@@ -769,6 +769,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Oct 15 2015 Petr Jasicek <pjasicek@redhat.com> - 41.0.2-2
+- Added private browsing action to desktop file - rhbz#1262564
+
 * Thu Oct 15 2015 Martin Stransky <stransky@redhat.com> - 41.0.2-1
 - Update to 41.0.2