Author: blekot Date: Wed Mar 30 09:01:36 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 4.0 - rel 1
---- Files affected: packages/mozilla-firefox-bin: mozilla-firefox-bin.spec (1.73 -> 1.74) ---- Diffs: ================================================================ Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.spec diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.73 packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.74 --- packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.73 Sun Oct 31 10:16:22 2010 +++ packages/mozilla-firefox-bin/mozilla-firefox-bin.spec Wed Mar 30 11:01:31 2011 @@ -3,17 +3,19 @@ Summary: Mozilla Firefox web browser Summary(pl.UTF-8): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox-bin -Version: 3.6.12 +Version: 4.0 Release: 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-md5: d9c3db10ca1af52bdcbdadf2ca314772 -Source1: %{name}.desktop -Source2: %{name}.sh -Patch0: %{name}-agent.patch -Patch1: %{name}-ti-agent.patch -Patch2: nochilds.patch +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: 0780e44f18c3b30a40e5ac8e110b77ff +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: b8c24a57a8c3531284aff77f6eb1ba2f +Source2: %{name}.desktop +Source3: %{name}.sh +#Patch0: %{name}-agent.patch +#Patch1: %{name}-ti-agent.patch +#Patch2: nochilds.patch URL: http://www.mozilla.org/projects/firefox/ BuildRequires: rpmbuild(macros) >= 1.453 BuildRequires: zip @@ -23,20 +25,18 @@ Provides: wwwbrowser Obsoletes: mozilla-firebird Conflicts: mozilla-firefox -ExclusiveArch: i686 athlon +ExclusiveArch: i686 athlon %{x8664} 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 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 +%define moz_caps libmozalloc.so libmozsqlite3.so libxpcom.so libxul.so %define sqlite_caps 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 _noautoprov %{moz_caps} %define _noautoreq %{_noautoprov} %{sqlite_caps} # no debuginfo available @@ -52,25 +52,30 @@ %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 +#%patch0 -p0 %endif %if "%{pld_release}" == "ti" -%patch1 -p0 +#%patch1 -p0 %endif -%patch2 -p1 +#%patch2 -p1 %install rm -rf $RPM_BUILD_ROOT install -d \ - $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/%{name}} \ - $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ + $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/%{name}/plugins} \ + $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} cp -a . $RPM_BUILD_ROOT%{_libdir}/%{name} -sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/%{name} +sed 's,@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 @@ -99,11 +104,8 @@ # remove unecessary stuff rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list rm $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/.autoreg %clean rm -rf $RPM_BUILD_ROOT @@ -135,7 +137,9 @@ %dir %{_libdir}/%{name} %{_libdir}/%{name}/application.ini %{_libdir}/%{name}/blocklist.xml -%{_libdir}/%{name}/browserconfig.properties +#%{_libdir}/%{name}/browserconfig.properties +%{_libdir}/%{name}/chrome.manifest +%{_libdir}/%{name}/omni.jar %{_libdir}/%{name}/platform.ini %attr(755,root,root) %{_libdir}/%{name}/firefox %attr(755,root,root) %{_libdir}/%{name}/firefox-bin @@ -145,23 +149,28 @@ %{_libdir}/%{name}/chrome %{_libdir}/%{name}/defaults %{_libdir}/%{name}/dictionaries -%{_libdir}/%{name}/greprefs +#%{_libdir}/%{name}/greprefs %{_libdir}/%{name}/icons -%{_libdir}/%{name}/modules -%{_libdir}/%{name}/res +#%{_libdir}/%{name}/modules +#%{_libdir}/%{name}/res %{_libdir}/%{name}/searchplugins %dir %{_libdir}/%{name}/extensions # the signature of the default theme %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +#%dir %{_libdir}/%{name}/distribution +#%dir %{_libdir}/%{name}/distribution/extensions +#%{_libdir}/%{name}/distribution/extensions/[email protected] + %dir %{_libdir}/%{name}/components %attr(755,root,root) %{_libdir}/%{name}/components/*.so -%{_libdir}/%{name}/components/*.js -%{_libdir}/%{name}/components/*.xpt +%{_libdir}/%{name}/components/binary.manifest +#%{_libdir}/%{name}/components/*.js +#%{_libdir}/%{name}/components/*.xpt %dir %{_libdir}/%{name}/plugins -%attr(755,root,root) %{_libdir}/%{name}/plugins/libnullplugin.so +#%attr(755,root,root) %{_libdir}/%{name}/plugins/libnullplugin.so %attr(755,root,root) %{_libdir}/%{name}/*.so %attr(755,root,root) %{_libdir}/%{name}/*.sh @@ -179,6 +188,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.74 2011/03/30 09:01:31 blekot +- up to 4.0 +- rel 1 + Revision 1.73 2010/10/31 09:16:22 marcus - up to 3.6.12 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.spec?r1=1.73&r2=1.74&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
