- 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

diff --git a/mozilla-firefox-bin.desktop b/mozilla-firefox-bin.desktop
index 25eff0b0108d4bc5de1901ab68f10a0d58803f97..3b2a129595d2b7b64d5f717df7fcf22de856c71b 100644 (file)
--- 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 9e5d321f4c53199ad0068fd95a84c29881cf26eb..45e1487912ab6afa02e49eef34442b636dcd07ad 100644 (file)
--- 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 2447634ffde3bac4d7b5b98f232dd198ac0d3685..66c6ba28079cbb3bcb1f6a8c4d328952296f898e 100644 (file)
--- 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