X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=mozilla-firefox-bin.spec;h=fb2f5b672f8105646210cc3fa8bf46555b4c9fde;hb=9f1030003166351e157beca3d56e7a1223e46998;hp=4ed07fcdc7043e319a32fdba112f20be1b0fedc8;hpb=21838b4c797261672a915f431f59726f16a3973a;p=packages%2Fmozilla-firefox-bin.git

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 4ed07fc..fb2f5b6 100644
--- 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:	7.0.1
+Version:	25.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:	04f39e837aead90dcba3108e6212b470
-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:	20d6c8e3dfc97d08d1dec7d0479f924f
+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:	9de2ba99a9139ae31576e5dce378e12b
+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:	1487e216e93417925ff9a8c1a5bdb0a3
 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
@@ -95,6 +95,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil
 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
@@ -103,9 +105,7 @@ 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}/removed-files
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -126,7 +126,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/firefox-bin
 
@@ -136,10 +135,18 @@ 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.jar
+%{_libdir}/%{name}/omni.ja
 %{_libdir}/%{name}/platform.ini
 %attr(755,root,root) %{_libdir}/%{name}/firefox
 %attr(755,root,root) %{_libdir}/%{name}/firefox-bin
@@ -147,20 +154,24 @@ 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}/dependentlibs.list
 %{_libdir}/%{name}/dictionaries
 #%{_libdir}/%{name}/greprefs
-%{_libdir}/%{name}/hyphenation
-%{_libdir}/%{name}/hyphenation/hyph_en_US.dic
+#%{_libdir}/%{name}/hyphenation
+#%{_libdir}/%{name}/hyphenation/hyph_en_US.dic
 %{_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 +179,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