Summary: Mozilla Firefox web browser
Summary(pl.UTF-8): Mozilla Firefox - przeglądarka WWW
Name: mozilla-firefox-bin
-Version: 18.0.2
-Release: 2
+Version: 22.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?/%{realname}-%{version}.i686.tar.bz2
-# Source0-md5: 9eb4dcf2e9578203a16da3c70817ccb2
-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: 29903172f6fd788f04dbeb27b9193fe6
+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: 997543bf6f142ab5227ff4519cd78559
+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: 4c9e49ff99eb7fddb8bfa5cd12d57508
Source2: %{name}.desktop
Source3: %{name}.sh
#Patch0: %{name}-agent.patch
%install
rm -rf $RPM_BUILD_ROOT
install -d \
- $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/%{name}/plugins} \
+ $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},' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{name}
ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/firefox-bin
cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-cp -a icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+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
# remove unecessary stuff
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
%clean
rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/application.ini
-%{_libdir}/%{name}/blocklist.xml
+
+%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
%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
%attr(755,root,root) %{_libdir}/%{name}/plugin-container
-%{_libdir}/%{name}/chrome
+%{_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}/icons
#%{_libdir}/%{name}/modules
#%{_libdir}/%{name}/res
-%{_libdir}/%{name}/searchplugins
+%{_libdir}/%{name}/browser/searchplugins
%{_libdir}/%{name}/webapprt
%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
-%dir %{_libdir}/%{name}/extensions
+%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
%dir %{_libdir}/%{name}/components
%attr(755,root,root) %{_libdir}/%{name}/components/*.so
-%{_libdir}/%{name}/components/binary.manifest
+%{_libdir}/%{name}/components/components.manifest
#%{_libdir}/%{name}/components/*.js
#%{_libdir}/%{name}/components/*.xpt
-%dir %{_libdir}/%{name}/plugins
+%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
# crashreporter
%attr(755,root,root) %{_libdir}/%{name}/crashreporter
-%{_libdir}/%{name}/crashreporter-override.ini
+%{_libdir}/%{name}/browser/crashreporter-override.ini
%{_libdir}/%{name}/crashreporter.ini
%{_pixmapsdir}/%{name}.png