- 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 c4c8f0202fdaff977c4d9bdbae4c2cb72783a325..66c6ba28079cbb3bcb1f6a8c4d328952296f898e 100644 (file)
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -1,17 +1,17 @@
 %define                realname        firefox
 Summary:       Mozilla Firefox web browser
-Summary(pl):   Mozilla Firefox - przegl±darka WWW
+Summary(pl.UTF-8):     Mozilla Firefox - przeglądarka WWW
 Name:          mozilla-firefox-bin
-Version:       2.0
-Release:       1
+Version:       3.6.3
+Release:       2
 License:       MPL/LGPL
 Group:         X11/Applications/Networking
-Source0:       http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0/linux-i686/pl/%{realname}-%{version}.tar.gz
-# Source0-md5: 22330d74779d1b9b98d3dbc92a82628f
+Source0:       http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2
+# Source0-md5: 000a171aa2ef6153b8ac088129ca6620
 Source1:       %{name}.desktop
+Source2:       %{name}.sh
 URL:           http://www.mozilla.org/projects/firefox/
 BuildRequires: zip
-Requires:      heimdal
 Provides:      wwwbrowser
 Obsoletes:     mozilla-firebird
 Conflicts:     mozilla-firefox
@@ -19,18 +19,24 @@ ExclusiveArch:      i686 athlon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _firefoxdir     %{_libdir}/%{name}
-# mozilla and firefox provide their own versions
-%define                _noautoreqdep           libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so
-%define                _noautoprovfiles        libplc4.so libplds4.so
-%define                _noautoreq              libnspr4.so libplc4.so libplds4.so liblinc.so.1
+
+%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 libsqlite3.so
+
+# list of files (regexps) which don't generate Provides
+%define                _noautoprovfiles        %{_libdir}/%{name}/components
+# list of script capabilities (regexps) not to be used in Provides
+%define                _noautoprov                     %{moz_caps} %{nss_caps} %{nspr_caps}
+%define                _noautoreq                      %{_noautoprov}
 
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
 compliance, performance and portability.
 
-%description -l pl
-Mozilla Firefox jest open sourcow± przegl±dark± sieci WWW, stworzon± z
-my¶l± o zgodno¶ci ze standardami, wydajno¶ci± i przeno¶no¶ci±.
+%description -l pl.UTF-8
+Mozilla Firefox jest open sourcową przeglądarką sieci WWW, stworzoną z
+myślą o zgodności ze standardami, wydajnością i przenośnością.
 
 %prep
 %setup -q -n %{realname}
@@ -40,49 +46,43 @@ my
 rm -rf $RPM_BUILD_ROOT
 install -d \
        $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
-       $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_firefoxdir}} \
-       $RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
-
-cp -r * $RPM_BUILD_ROOT%{_firefoxdir}
-ln -s %{_firefoxdir}/firefox $RPM_BUILD_ROOT%{_bindir}/firefox
+       $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-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
 
-%post -p /sbin/ldconfig
-%postun
-if [ "$1" == "0" ]; then
-       rm -rf %{_firefoxdir}/chrome/overlayinfo
-       rm -f  %{_firefoxdir}/chrome/*.rdf
-       rm -rf %{_firefoxdir}/components
-       rm -rf %{_firefoxdir}/extensions
-fi
-
 %files
 %defattr(644,root,root,755)
-%{_firefoxdir}/libsoftokn3.chk
-%attr(755,root,root) %{_bindir}/firefox
-%dir %{_firefoxdir}
-%{_firefoxdir}/res
-%dir %{_firefoxdir}/components
-%attr(755,root,root) %{_firefoxdir}/components/*.so
-%{_firefoxdir}/components/*.js
-%{_firefoxdir}/components/*.xpt
-%{_firefoxdir}/plugins
-%{_firefoxdir}/searchplugins
-%{_firefoxdir}/icons
-%{_firefoxdir}/defaults
-%{_firefoxdir}/greprefs
-%{_firefoxdir}/browserconfig.properties
-%{_firefoxdir}/dictionaries
-%attr(755,root,root) %{_firefoxdir}/*.so
-%attr(755,root,root) %{_firefoxdir}/*.sh
-%attr(755,root,root) %{_firefoxdir}/m*
-%attr(755,root,root) %{_firefoxdir}/f*
-%attr(755,root,root) %{_firefoxdir}/x*
-#%{_pixmapsdir}/*
-%{_desktopdir}/*
-
-%{_firefoxdir}/chrome/*
+%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
+%{_libdir}/%{name}/components/*.xpt
+%{_libdir}/%{name}/chrome
+%{_libdir}/%{name}/defaults
+%{_libdir}/%{name}/greprefs
+%{_libdir}/%{name}/icons
+%{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/searchplugins
+%{_libdir}/%{name}/dictionaries
+%{_libdir}/%{name}/browserconfig.properties
+%{_libdir}/%{name}/libfreebl3.chk
+%{_libdir}/%{name}/libsoftokn3.chk
+%attr(755,root,root) %{_libdir}/%{name}/*.so
+%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