X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=mozilla-firefox-bin.spec;h=878a167e0013cd4f18861d6ed8a6dd333df1390a;hb=247bca6fef1876de011f64de6c840896fdcbaf89;hp=129714a69fcbc28af230661617cefed075f8e000;hpb=6b930f4d9f2d2eddb1ab734cdde6f6d825092fbb;p=packages%2Fmozilla-firefox-bin.git

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 129714a..878a167 100644
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -2,26 +2,25 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
-Version:	6.0.1
+Version:	46.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:	5bb72a9458ac56e90be139ff9a911b67
-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:	801301ddc669ee84bd26977fcee9a7b5
+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:	e861db7b870bb565264a8ba1d916ffd1
+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:	ceeffb5f47a79d405da79708380b0554
 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/
+URL:		https://www.mozilla.org/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:	sqlite3 >= 3.6.22-2
+Requires:	nspr >= 1:4.12
+Requires:	nss >= 1:3.21.1
+Requires:	sqlite3 >= 3.8.11.1
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
 Conflicts:	mozilla-firefox
@@ -36,8 +35,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # 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}
-%define		_noautoreq  		%{_noautoprov} %{sqlite_caps} libnotify.so.1
+%define		_noautoprov		%{moz_caps}
+%define		_noautoreq		%{_noautoprov} %{sqlite_caps} libnotify.so.1
 
 # no debuginfo available
 %define		_enable_debug_packages	0
@@ -58,54 +57,45 @@ 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
+rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
 # use system sqlite
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite3.so
-ln -s /%{_lib}/libsqlite3.so.0 $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite3.so
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozsqlite3.so
+ln -s /%{_lib}/libsqlite3.so.0 $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozsqlite3.so
 
 # never package these
 # nss
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
 # nspr
-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
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.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
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/updater
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/updater.ini
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/update-settings.ini
+rm $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
@@ -118,15 +108,16 @@ exit 0
 
 %post
 %update_browser_plugins
+%update_desktop_database_post
 
 %postun
+%update_desktop_database_postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/firefox-bin
 
@@ -136,51 +127,55 @@ fi
 
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/application.ini
-%{_libdir}/%{name}/blocklist.xml
-#%{_libdir}/%{name}/browserconfig.properties
-%{_libdir}/%{name}/chrome.manifest
-%{_libdir}/%{name}/omni.jar
+
+%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}/omni.ja
 %{_libdir}/%{name}/platform.ini
 %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}/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}/icons
-#%{_libdir}/%{name}/modules
-#%{_libdir}/%{name}/res
-%{_libdir}/%{name}/searchplugins
+%{_libdir}/%{name}/webapprt
+%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
 
-%dir %{_libdir}/%{name}/extensions
-# the signature of the default theme
-%{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so
 
-#%dir %{_libdir}/%{name}/distribution
-#%dir %{_libdir}/%{name}/distribution/extensions
-#%{_libdir}/%{name}/distribution/extensions/testpilot@labs.mozilla.com.xpi
+%dir %{_libdir}/%{name}/browser/extensions
+# the signature of the default theme
+%{_libdir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
 
-%dir %{_libdir}/%{name}/components
-%attr(755,root,root) %{_libdir}/%{name}/components/*.so
-%{_libdir}/%{name}/components/binary.manifest
-#%{_libdir}/%{name}/components/*.js
-#%{_libdir}/%{name}/components/*.xpt
+%dir %{_libdir}/%{name}/browser/features
+%{_libdir}/%{name}/browser/features/loop@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/e10srollout@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/firefox@getpocket.com.xpi
 
-%dir %{_libdir}/%{name}/plugins
-#%attr(755,root,root) %{_libdir}/%{name}/plugins/libnullplugin.so
+%dir %{_libdir}/%{name}/browser/plugins
 %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
 
+%dir %{_libdir}/%{name}/gmp-clearkey
+%dir %{_libdir}/%{name}/gmp-clearkey/0.1
+%{_libdir}/%{name}/gmp-clearkey/0.1/clearkey.info
+%attr(755,root,root) %{_libdir}/%{name}/gmp-clearkey/0.1/libclearkey.so
+
 %{_pixmapsdir}/%{name}.png
 %{_desktopdir}/%{name}.desktop