- don't conflict with iceweasel (parrallel installation is now possible)

[packages/mozilla-firefox-bin.git] / mozilla-firefox-bin.spec

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 0e81a7c3337ca930899d5b70857b4c76497a99c1..66c6ba28079cbb3bcb1f6a8c4d328952296f898e 100644 (file)
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -2,12 +2,12 @@
 Summary:       Mozilla Firefox web browser
 Summary(pl.UTF-8):     Mozilla Firefox - przeglądarka WWW
 Name:          mozilla-firefox-bin
-Version:       3.0.7   
-Release:       1
+Version:       3.6.3
+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
-# Source0-md5: 06deb26f33d2eb52c5f1192bb66f0a17
+# Source0-md5: 000a171aa2ef6153b8ac088129ca6620
 Source1:       %{name}.desktop
 Source2:       %{name}.sh
 URL:           http://www.mozilla.org/projects/firefox/
@@ -20,9 +20,9 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _firefoxdir     %{_libdir}/%{name}
 
-%define                nss_caps        libfreebl3.so libnss3.so libnssckbi.so libsmime3.so ibsoftokn3.so libssl3.so
+%define                nss_caps        libfreebl3.so libnss3.so libnssckbi.so libsmime3.so ibsoftokn3.so libssl3.so libnssutil3.so libnssdbm3.so
 %define                nspr_caps       libnspr4.so libplc4.so libplds4.so
-%define                moz_caps        libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libnullplugin.so libxpcom_compat.so libxpcom_core.so libxpcom.so libxpistub.so libxul.so
+%define                moz_caps        libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libnullplugin.so libxpcom_compat.so libxpcom_core.so libxpcom.so libxpistub.so libxul.so libsqlite3.so
 
 # list of files (regexps) which don't generate Provides
 %define                _noautoprovfiles        %{_libdir}/%{name}/components
@@ -48,20 +48,24 @@ install -d \
        $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
        $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
+cp -a . $RPM_BUILD_ROOT%{_libdir}/%{name}
+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
 
 %clean
 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
 %{_libdir}/%{name}/res
+%dir %{_libdir}/%{name}/extensions
 %dir %{_libdir}/%{name}/components
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so
 %{_libdir}/%{name}/components/*.js
@@ -80,4 +84,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
 %attr(755,root,root) %{_libdir}/%{name}/m*
 %attr(755,root,root) %{_libdir}/%{name}/f*
+%{_pixmapsdir}/mozilla-firefox-bin.png
 %{_desktopdir}/*.desktop