-# TODO
-# /usr/lib/mozilla-firefox-bin/.autoreg
-# /usr/lib/mozilla-firefox-bin/LICENSE
-# /usr/lib/mozilla-firefox-bin/README.txt
-# /usr/lib/mozilla-firefox-bin/Throbber-small.gif
-# /usr/lib/mozilla-firefox-bin/blocklist.xml
-# /usr/lib/mozilla-firefox-bin/crashreporter
-# /usr/lib/mozilla-firefox-bin/crashreporter-override.ini
-# /usr/lib/mozilla-firefox-bin/crashreporter.ini
-# /usr/lib/mozilla-firefox-bin/update.locale
-# /usr/lib/mozilla-firefox-bin/updater
-# /usr/lib/mozilla-firefox-bin/updater.ini
%define realname firefox
Summary: Mozilla Firefox web browser
Summary(pl.UTF-8): Mozilla Firefox - przeglądarka WWW
Name: mozilla-firefox-bin
-Version: 3.6.8
-Release: 0.3
+Version: 26.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: 689232baf90592cf237817c34ac29bb2
-Source1: %{name}.desktop
-Source2: %{name}.sh
-Patch0: %{name}-agent.patch
-Patch1: %{name}-ti-agent.patch
+Source0: http://download.cdn.mozilla.net/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2?/%{realname}-%{version}.i686.tar.bz2
+# Source0-md5: 92f89c9e4f8325e947de8918efb18e55
+Source1: http://download.cdn.mozilla.net/pub/mozilla.org/%{realname}/releases/%{version}/linux-x86_64/en-US/%{realname}-%{version}.tar.bz2?/%{realname}-%{version}.x8664.tar.bz2
+# Source1-md5: 4b74154431b8a3766fad4fe4fe1f9f7c
+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
Requires: browser-plugins >= 2.0
Requires: myspell-common
+Requires: nss >=3.12.10
Requires: sqlite3 >= 3.6.22-2
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 _noautoreq %{_noautoprov} %{sqlite_caps}
+%define _noautoprov %{moz_caps}
+%define _noautoreq %{_noautoprov} %{sqlite_caps} libnotify.so.1
# no debuginfo available
%define _enable_debug_packages 0
myślą o zgodności ze standardami, wydajnością i przenośnością.
%prep
-%setup -q -n %{realname}
+%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
%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}/browser/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 icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a browser/icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins
# use system dict
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
# mozldap
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
+grep -v 'libnspr4.so\|libplc4.so\|libplds4.so\|libnssutil3.so\|libnss3.so\|libsmime3.so\|libssl3.so' \
+ dependentlibs.list > $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
+
+# remove update notifier, we prefer rpm packages for updating
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/updater
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/updater.ini
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/update.locale
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/Throbber-small.gif
# remove unecessary stuff
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files
%clean
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/application.ini
+
+%dir %{_libdir}/%{name}/browser
+%{_libdir}/%{name}/browser/blocklist.xml
+%{_libdir}/%{name}/browser/chrome.manifest
+%{_libdir}/%{name}/browser/omni.ja
+
+%dir %{_libdir}/%{name}/browser/components
+%{_libdir}/%{name}/browser/components/components.manifest
+%attr(755,root,root) %{_libdir}/%{name}/browser/components/libbrowsercomps.so
+#%{_libdir}/%{name}/browserconfig.properties
+%{_libdir}/%{name}/chrome.manifest
+%{_libdir}/%{name}/omni.ja
%{_libdir}/%{name}/platform.ini
-%{_libdir}/%{name}/res
-%dir %{_libdir}/%{name}/extensions
+%attr(755,root,root) %{_libdir}/%{name}/firefox
+%attr(755,root,root) %{_libdir}/%{name}/firefox-bin
+%attr(755,root,root) %{_libdir}/%{name}/precomplete
+%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
+%attr(755,root,root) %{_libdir}/%{name}/plugin-container
+
+%{_libdir}/%{name}/browser/chrome
+%{_libdir}/%{name}/browser/icons
+%{_libdir}/%{name}/defaults
+%{_libdir}/%{name}/dependentlibs.list
+%{_libdir}/%{name}/dictionaries
+#%{_libdir}/%{name}/greprefs
+#%{_libdir}/%{name}/hyphenation
+#%{_libdir}/%{name}/hyphenation/hyph_en_US.dic
+%{_libdir}/%{name}/icons
+#%{_libdir}/%{name}/modules
+#%{_libdir}/%{name}/res
+%{_libdir}/%{name}/browser/searchplugins
+%{_libdir}/%{name}/webapprt
+%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
+
+%dir %{_libdir}/%{name}/browser/extensions
# the signature of the default theme
-%{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{_libdir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+
+#%dir %{_libdir}/%{name}/distribution
+#%dir %{_libdir}/%{name}/distribution/extensions
+#%{_libdir}/%{name}/distribution/extensions/testpilot@labs.mozilla.com.xpi
%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
-%dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/plugins/libnullplugin.so
-%{_libdir}/%{name}/searchplugins
-%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/browserconfig.properties
+%{_libdir}/%{name}/components/components.manifest
+#%{_libdir}/%{name}/components/*.js
+#%{_libdir}/%{name}/components/*.xpt
+
+%dir %{_libdir}/%{name}/browser/plugins
+#%attr(755,root,root) %{_libdir}/%{name}/plugins/libnullplugin.so
%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*
+
+# crashreporter
+%attr(755,root,root) %{_libdir}/%{name}/crashreporter
+%{_libdir}/%{name}/browser/crashreporter-override.ini
+%{_libdir}/%{name}/crashreporter.ini
+
%{_pixmapsdir}/%{name}.png
%{_desktopdir}/%{name}.desktop
projects / packages / mozilla-firefox-bin.git / blobdiff