From 2afe0ea713af6f9d540a62d12c62f82ae04f5689 Mon Sep 17 00:00:00 2001
From: shadzik <shadzik@pld-linux.org>
Date: Sun, 4 Apr 2010 03:14:00 +0000
Subject: [PATCH] - don't conflict with iceweasel (parrallel installation is
 now possible) - rel 2

Changed files:
    mozilla-firefox-bin.desktop -> 1.5
    mozilla-firefox-bin.sh -> 1.3
    mozilla-firefox-bin.spec -> 1.50
---
 mozilla-firefox-bin.desktop |  2 +-
 mozilla-firefox-bin.sh      |  2 +-
 mozilla-firefox-bin.spec    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mozilla-firefox-bin.desktop b/mozilla-firefox-bin.desktop
index 25eff0b..3b2a129 100644
--- a/mozilla-firefox-bin.desktop
+++ b/mozilla-firefox-bin.desktop
@@ -3,7 +3,7 @@ Name=Mozilla Firefox
 Name[pl]=Mozilla Firefox
 GenericName=Web Browser
 GenericName[pl]=Przeglądarka WWW
-Exec=firefox
+Exec=firefox-bin
 Icon=mozilla-firefox-bin
 Terminal=false
 Type=Application
diff --git a/mozilla-firefox-bin.sh b/mozilla-firefox-bin.sh
index 9e5d321..45e1487 100644
--- a/mozilla-firefox-bin.sh
+++ b/mozilla-firefox-bin.sh
@@ -35,7 +35,7 @@ fi
 # compreg.dat and/or chrome.rdf will screw things up if it's from an
 # older version.  http://bugs.gentoo.org/show_bug.cgi?id=63999
 for f in ~/{.,.mozilla/}firefox/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do
-	if [[ -f ${f} && ${f} -ot /usr/bin/mozilla-firefox ]]; then
+	if [[ -f ${f} && ${f} -ot /usr/bin/mozilla-firefox-bin ]]; then
 		echo "Removing ${f} leftover from older firefox"
 		rm -f "${f}"
 	fi
diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 2447634..66c6ba2 100644
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -3,7 +3,7 @@ Summary:	Mozilla Firefox web browser
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
 Version:	3.6.3
-Release:	1
+Release:	2
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2
@@ -49,8 +49,8 @@ install -d \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}} \
 
 cp -a . $RPM_BUILD_ROOT%{_libdir}/%{name}
-sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
-ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
+sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox-bin
+ln -s mozilla-firefox-bin $RPM_BUILD_ROOT%{_bindir}/firefox-bin
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox-bin.png
 
@@ -59,8 +59,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mozilla-firefox
-%attr(755,root,root) %{_bindir}/firefox
+%attr(755,root,root) %{_bindir}/mozilla-firefox-bin
+%attr(755,root,root) %{_bindir}/firefox-bin
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/application.ini
 %{_libdir}/%{name}/platform.ini
-- 
2.43.0