X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fmozilla-firefox-bin.git;a=blobdiff_plain;f=mozilla-firefox-bin.spec;h=a06c0a43193b4b8c58da7b430c170422a5e19b17;hp=a04eeb4e2a6d9dacd181807199fc3cf417220127;hb=ddd17e66caa5e65df38dfd28ec369c97126394b3;hpb=fc63c59933a1afd227b5a7ef2c2027f95151d79d

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index a04eeb4..a06c0a4 100644
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -1,5 +1,5 @@
 # Conditional build:
-%bcond_without	system_ffmpeg	# build with internal ffmpeg library
+%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
 
@@ -11,14 +11,14 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
-Version:	57.0.2
+Version:	67.0.3
 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:	56d96307b58b07f3921145dee7346180
+# Source0-md5:	87bbf86b7b5c3233d7fa006e1e5c578a
 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:	884e33b3d0ad69d60bf7148653ec3944
+# Source1-md5:	acc344b81f181115c04da1b8ae496e22
 Source2:	%{name}.desktop
 Source3:	%{name}.sh
 URL:		https://www.mozilla.org/firefox/
@@ -27,12 +27,11 @@ BuildRequires:	zip
 Requires(post,postun):	desktop-file-utils
 Requires:	browser-plugins >= 2.0
 Requires:	cpuinfo(sse2)
-%{?with_system_ffmpeg:Requires:	ffmpeg-libs >= 3.2.1}
+%{?with_system_ffmpeg:Requires:	ffmpeg-libs >= 3.4}
 %{?with_system_gtk:Requires:	gtk+3 >= 3.22}
-Requires:	myspell-common
-Requires:	nspr >= 1:4.16
-Requires:	nss >= 1:3.32.1
-%{?with_system_sqlite:Requires:	sqlite3 >= 3.19.3}
+Requires:	nspr >= 1:4.21
+Requires:	nss >= 1:3.43
+%{?with_system_sqlite:Requires:	sqlite3 >= 3.27.2}
 Suggests:	pulseaudio
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
@@ -81,14 +80,10 @@ 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 browser/icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -a browser/chrome/icons/default/default128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 %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
@@ -127,12 +122,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
@@ -155,7 +144,6 @@ fi
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/application.ini
 %{_libdir}/%{name}/chrome.manifest
-%{_libdir}/%{name}/icudt59l.dat
 
 %dir %{_libdir}/%{name}/browser
 %{_libdir}/%{name}/browser/blocklist.xml
@@ -172,37 +160,25 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/precomplete
 
 %{_libdir}/%{name}/browser/chrome
-%{_libdir}/%{name}/browser/icons
 %{_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/e10srollout@mozilla.org.xpi
-%{_libdir}/%{name}/browser/features/firefox@getpocket.com.xpi
-%{_libdir}/%{name}/browser/features/followonsearch@mozilla.com.xpi
 %{_libdir}/%{name}/browser/features/formautofill@mozilla.org.xpi
-%{_libdir}/%{name}/browser/features/onboarding@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/fxmonitor@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/screenshots@mozilla.org.xpi
-%{_libdir}/%{name}/browser/features/shield-recipe-client@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
-%attr(755,root,root) %{_libdir}/%{name}/*.sh
 
 # crashreporter
 %attr(755,root,root) %{_libdir}/%{name}/crashreporter