X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox-bin.spec;h=e72f871267253439af49f72572c8d5752f683ca6;hb=b2d03503182d5417165553d1d5281f4ea072c11b;hp=b3a903d84da44da608b3095ff5d57049ec926625;hpb=e99701b0568216a141ace415917b62b0cdb937c4;p=packages%2Fmozilla-firefox-bin.git

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index b3a903d..e72f871 100644
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -2,25 +2,23 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
-Version:	20.0
+Version:	34.0.5
 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:	961e0203371093b552ed20ccd82d1eab
-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:	b793b237f59e01012cde0bc55284a69f
+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:	dfe5bc7643b3a5636e6775d236f071a5
+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:	1ffca0d8ef608123f2b9b30382043b6a
 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(post,postun):	desktop-file-utils
 Requires:	browser-plugins >= 2.0
 Requires:	myspell-common
-Requires:	nss >=3.12.10
+Requires:	nss >= 1:3.15.4
 Requires:	sqlite3 >= 3.6.22-2
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
@@ -58,27 +56,20 @@ myślą o zgodności ze standardami, wydajnością i przenośnością.
 %ifarch %{x8664}
 %{__tar} jxf %{SOURCE1} --strip-components=1
 %endif
-%if "%{pld_release}" == "th"
-#%patch0 -p0
-%endif
-%if "%{pld_release}" == "ti"
-#%patch1 -p0
-%endif
-#%patch2 -p1
 
 %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,16 +86,18 @@ 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
 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}/update-settings.ini
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/Throbber-small.gif
 
 # 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
@@ -117,8 +110,10 @@ exit 0
 
 %post
 %update_browser_plugins
+%update_desktop_database_post
 
 %postun
+%update_desktop_database_postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
@@ -134,7 +129,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,8 +148,10 @@ 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
@@ -154,13 +159,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 +173,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