- up to 21.0

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 5f769568a6961ad82a8269bb341bdbab2c372173..3cd780701b611298fc01bc6bd0887fa349568a45 100644 (file)
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -2,14 +2,14 @@
 Summary:       Mozilla Firefox web browser
 Summary(pl.UTF-8):     Mozilla Firefox - przeglądarka WWW
 Name:          mozilla-firefox-bin
-Version:       20.0.1
+Version:       21.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: 4cecee4d0df9b0e0e1152c0cbe9a5f8f
+# Source0-md5: 42b67cb406c3245ec4b24b0e9314aa8d
 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: 277795a22f7b140cf9ea778d950c1499
+# Source1-md5: ff4e8af2ad953aacacd348a78325669f
 Source2:       %{name}.desktop
 Source3:       %{name}.sh
 #Patch0:               %{name}-agent.patch
@@ -69,16 +69,16 @@ myślą o zgodności ze standardami, wydajnością i przenośnością.
 %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
@@ -134,7 +134,15 @@ fi
 
 %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
@@ -145,7 +153,8 @@ fi
 %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}/dictionaries
 #%{_libdir}/%{name}/greprefs
@@ -154,13 +163,13 @@ fi
 %{_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
@@ -168,18 +177,18 @@ fi
 
 %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