packages (DEVEL): mozilla-firefox-bin/mozilla-firefox-bin.spec - add 64bit ...

[atler]

Author: atler                        Date: Thu Dec  9 15:17:02 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- add 64bit version
- explicitly install plugins dir

---- Files affected:
packages/mozilla-firefox-bin:
   mozilla-firefox-bin.spec (1.73.2.1 -> 1.73.2.2) 

---- Diffs:

================================================================
Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.spec
diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.73.2.1 packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.73.2.2
--- packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.73.2.1	Tue Nov 30 17:36:39 2010
+++ packages/mozilla-firefox-bin/mozilla-firefox-bin.spec	Thu Dec  9 16:16:57 2010
@@ -7,10 +7,12 @@
 Release:	0.1
 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:	http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2#/%{realname}-%{version}.i686.tar.bz2
 # Source0-md5:	50f6b8f9e472a8dee6d67a2df6b1609d
-Source1:	%{name}.desktop
-Source2:	%{name}.sh
+Source1:	http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-x86_64/en-US/%{realname}-%{version}.tar.bz2#/%{realname}-%{version}.x8664.tar.bz2
+# Source1-md5:	c1789092173efd6298e431f11bfe2601
+Source2:	%{name}.desktop
+Source3:	%{name}.sh
 #Patch0:		%{name}-agent.patch
 #Patch1:		%{name}-ti-agent.patch
 #Patch2:		nochilds.patch
@@ -23,7 +25,7 @@
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
 Conflicts:	mozilla-firefox
-ExclusiveArch:	i686 athlon
+ExclusiveArch:	i686 athlon x86_64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_firefoxdir	%{_libdir}/%{name}
@@ -52,7 +54,12 @@
 
 %prep
 %setup -qcT
+%ifarch i686 athlon
 %{__tar} jxf %{SOURCE0} --strip-components=1
+%endif
+%ifarch %{x8664}
+%{__tar} jxf %{SOURCE1} --strip-components=1
+%endif
 %if "%{pld_release}" == "th"
 #%patch0 -p0
 %endif
@@ -66,11 +73,12 @@
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/%{name}} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 cp -a . $RPM_BUILD_ROOT%{_libdir}/%{name}
-sed 's, at LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/%{name}
+sed 's, at LIBDIR@,%{_libdir},' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{name}
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/firefox-bin
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 cp -a icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
@@ -162,7 +170,7 @@
 #%{_libdir}/%{name}/components/*.js
 #%{_libdir}/%{name}/components/*.xpt
 
-#%dir %{_libdir}/%{name}/plugins
+%dir %{_libdir}/%{name}/plugins
 #%attr(755,root,root) %{_libdir}/%{name}/plugins/libnullplugin.so
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
@@ -181,6 +189,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73.2.2  2010/12/09 15:16:57  atler
+- add 64bit version
+- explicitly install plugins dir
+
 Revision 1.73.2.1  2010/11/30 16:36:39  glen
 - 4.0b7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.spec?r1=1.73.2.1&r2=1.73.2.2&f=u