X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmozilla-firefox-bin.git;a=blobdiff_plain;f=mozilla-firefox-bin.spec;h=1234d2a40fccbadcb60ec6f5a60df8425cc8cb99;hp=13a9f4f69a1beded16fab3b2ae6cc3944b3167b1;hb=6e3970f;hpb=723421ec39536c1df1f4c61b079749c69c901b6a

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 13a9f4f..1234d2a 100644
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -1,7 +1,7 @@
 # Conditional build:
 %bcond_with	system_ffmpeg	# build with system ffmpeg library
 %bcond_without	system_gtk	# build with internal gtk library
-%bcond_without	system_sqlite	# build with internal sqlite library
+%bcond_with	system_sqlite	# build with internal sqlite library
 
 %define		realname	firefox
 %define		avcodec_soname_ver	57
@@ -11,14 +11,14 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
-Version:	60.0
+Version:	80.0
 Release:	1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	https://ftp.mozilla.org/pub/firefox/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2?/%{realname}-%{version}.i686.tar.bz2
-# Source0-md5:	623a30a7bb00f74428c1981d52191468
+# Source0-md5:	45f185a70e57fa6a33174d495eed5c47
 Source1:	https://ftp.mozilla.org/pub/firefox/releases/%{version}/linux-x86_64/en-US/%{realname}-%{version}.tar.bz2?/%{realname}-%{version}.x8664.tar.bz2
-# Source1-md5:	8f72b51fb4106848a20967a574e82d79
+# Source1-md5:	5f79c169c70451b24804a33b28aec503
 Source2:	%{name}.desktop
 Source3:	%{name}.sh
 URL:		https://www.mozilla.org/firefox/
@@ -28,11 +28,11 @@ Requires(post,postun):	desktop-file-utils
 Requires:	browser-plugins >= 2.0
 Requires:	cpuinfo(sse2)
 %{?with_system_ffmpeg:Requires:	ffmpeg-libs >= 3.4}
+Requires:	glib2 >= 1:2.42
 %{?with_system_gtk:Requires:	gtk+3 >= 3.22}
-Requires:	myspell-common
-Requires:	nspr >= 1:4.19
-Requires:	nss >= 1:3.36.1
-%{?with_system_sqlite:Requires:	sqlite3 >= 3.22.0}
+Requires:	nspr >= 1:4.27
+Requires:	nss >= 1:3.55
+%{?with_system_sqlite:Requires:	sqlite3 >= 3.31.1}
 Suggests:	pulseaudio
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
@@ -85,10 +85,6 @@ cp -a browser/chrome/icons/default/default128.png $RPM_BUILD_ROOT%{_pixmapsdir}/
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins
 
-# use system dict
-rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
-ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
-
 %if %{with system_ffmpeg}
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozavcodec.so
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozavutil.so
@@ -109,7 +105,7 @@ ln -s /%{_lib}/libsqlite3.so.%{sqlite_soname_ver} $RPM_BUILD_ROOT%{_libdir}/%{na
 
 # never package these
 # nss
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freeblpriv3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freeblpriv3,nss3,nssckbi,nssutil3,smime3,softokn3,ssl3}.*
 # nspr
 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' \
@@ -127,12 +123,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pretrans
-if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
-	mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
-fi
-exit 0
-
 %post
 %update_browser_plugins
 %update_desktop_database_post
@@ -154,11 +144,8 @@ fi
 
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/application.ini
-%{_libdir}/%{name}/chrome.manifest
 
 %dir %{_libdir}/%{name}/browser
-%{_libdir}/%{name}/browser/blocklist.xml
-%{_libdir}/%{name}/browser/chrome.manifest
 %{_libdir}/%{name}/browser/omni.ja
 
 %{_libdir}/%{name}/omni.ja
@@ -173,28 +160,20 @@ fi
 %{_libdir}/%{name}/browser/chrome
 %{_libdir}/%{name}/defaults
 %{_libdir}/%{name}/dependentlibs.list
-%{_libdir}/%{name}/dictionaries
 %{_libdir}/%{name}/icons
 
 %dir %{_libdir}/%{name}/fonts
-%{_libdir}/%{name}/fonts/EmojiOneMozilla.ttf
+%{_libdir}/%{name}/fonts/TwemojiMozilla.ttf
 
 %dir %{_libdir}/%{name}/gtk2
 %attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so
 
-%dir %{_libdir}/%{name}/browser/extensions
-# the signature of the default theme
-%{_libdir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
-
 %dir %{_libdir}/%{name}/browser/features
-%{_libdir}/%{name}/browser/features/activity-stream@mozilla.org.xpi
-%{_libdir}/%{name}/browser/features/aushelper@mozilla.org.xpi
-%{_libdir}/%{name}/browser/features/firefox@getpocket.com.xpi
-%{_libdir}/%{name}/browser/features/followonsearch@mozilla.com.xpi
+%{_libdir}/%{name}/browser/features/doh-rollout@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/formautofill@mozilla.org.xpi
-%{_libdir}/%{name}/browser/features/onboarding@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/screenshots@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/webcompat@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/webcompat-reporter@mozilla.org.xpi
 
 %dir %{_libdir}/%{name}/browser/plugins
 %attr(755,root,root) %{_libdir}/%{name}/*.so