X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fmozilla-firefox-bin.git;a=blobdiff_plain;f=mozilla-firefox-bin.spec;h=ebfb4edaf2003c599136c6aaba65ca7331d76d81;hp=b6706f75596aaa92210a092a35df981b19c66cfd;hb=724353085eaae62b69e77b22a25d975caf6137e1;hpb=3225a262bec1141332599eaf8a6125b3cc07795d

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index b6706f7..ebfb4ed 100644
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -1,17 +1,21 @@
 %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:	2
+Version:	3.6.3
+Release:	5
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0/linux-i686/en-US/%{realname}-%{version}.tar.gz
-# Source0-md5:	dec219811d989aeed2b8c7e338cc0b03
+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
+Patch0:		%{name}-agent.patch
+Patch1:		%{name}-ti-agent.patch
 URL:		http://www.mozilla.org/projects/firefox/
 BuildRequires:	zip
 Provides:	wwwbrowser
+Requires:	procps
 Obsoletes:	mozilla-firebird
 Conflicts:	mozilla-firefox
 ExclusiveArch:	i686 athlon
@@ -19,65 +23,77 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_firefoxdir	%{_libdir}/%{name}
 
-# mozilla and firefox provide their own versions
-# list of capabilities (SONAME, perl(module), php(module) regexps) which don't generate dependencies on package NAMES
-%define		_noautoreqdep		libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libxpcom_core.so libfreebl3.so libnspr4.so libplc4.so libplds4.so libfreebl3.so libnss3.so libnssckbi.so libsmime3.so libsoftokn3.chk libsoftokn3.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 libsqlite3.so
+
 # list of files (regexps) which don't generate Provides
-%define		_noautoprovfiles	%{_firefoxdir}/components
+%define		_noautoprovfiles	%{_libdir}/%{name}/components
 # list of script capabilities (regexps) not to be used in Provides
-%define		_noautoprov			libplc4.so libplds4.so
+%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}
+%if "%{pld_release}" == "th"
+%patch0 -p0
+%endif
+
+%if "%{pld_release}" == "ti"
+%patch1 -p0
+%endif
+
 
 %build
 %install
 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
 
 %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
-%{_firefoxdir}/libfreebl3.chk
-%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}/*
+%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
-
-%{_firefoxdir}/chrome