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

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 0763878..a04eeb4 100644
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -1,15 +1,24 @@
+# Conditional build:
+%bcond_without	system_ffmpeg	# build with internal ffmpeg library
+%bcond_without	system_gtk	# build with internal gtk library
+%bcond_without	system_sqlite	# build with internal sqlite library
+
 %define		realname	firefox
+%define		avcodec_soname_ver	57
+%define		avutil_soname_ver	55
+%define		gtk_soname_ver		0
+%define		sqlite_soname_ver	0
 Summary:	Mozilla Firefox web browser
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
-Version:	52.0
+Version:	57.0.2
 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:	39228da4947010a63a99aec4b648b916
+# Source0-md5:	56d96307b58b07f3921145dee7346180
 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:	e821a6ecc69c6dea96db818d33a8873b
+# Source1-md5:	884e33b3d0ad69d60bf7148653ec3944
 Source2:	%{name}.desktop
 Source3:	%{name}.sh
 URL:		https://www.mozilla.org/firefox/
@@ -17,10 +26,13 @@ BuildRequires:	rpmbuild(macros) >= 1.453
 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_gtk:Requires:	gtk+3 >= 3.22}
 Requires:	myspell-common
-Requires:	nspr >= 1:4.13.1
-Requires:	nss >= 1:3.28.3
-Requires:	sqlite3 >= 3.17.0
+Requires:	nspr >= 1:4.16
+Requires:	nss >= 1:3.32.1
+%{?with_system_sqlite:Requires:	sqlite3 >= 3.19.3}
 Suggests:	pulseaudio
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
@@ -30,7 +42,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_firefoxdir	%{_libdir}/%{name}
 
-%define		moz_caps	libmozalloc.so libmozsqlite3.so libxpcom.so libxul.so
+%define		moz_caps	libmozalloc.so libmozavcodec.so libmozavutil.so libclearkey.so liblgpllibs.so libmozgtk.so libmozsandbox.so libmozsqlite3.so libxpcom.so libxul.so
 %define		sqlite_caps	libsqlite3.so
 
 # list of files (regexps) which don't generate Provides
@@ -77,9 +89,23 @@ cp -a browser/icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 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
+ln -s %{_libdir}/libavcodec.so.%{avcodec_soname_ver} $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozavcodec.so
+ln -s %{_libdir}/libavutil.so.%{avutil_soname_ver} $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozavutil.so
+%endif
+
+%if %{with system_gtk}
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozgtk.so
+ln -s %{_libdir}/libgtk-3.so.%{gtk_soname_ver} $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozgtk.so
+%endif
+
+%if %{with system_sqlite}
 # use system sqlite
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozsqlite3.so
-ln -s /%{_lib}/libsqlite3.so.0 $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozsqlite3.so
+ln -s /%{_lib}/libsqlite3.so.%{sqlite_soname_ver} $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozsqlite3.so
+%endif
 
 # never package these
 # nss
@@ -129,7 +155,7 @@ fi
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/application.ini
 %{_libdir}/%{name}/chrome.manifest
-%{_libdir}/%{name}/icudt58l.dat
+%{_libdir}/%{name}/icudt59l.dat
 
 %dir %{_libdir}/%{name}/browser
 %{_libdir}/%{name}/browser/blocklist.xml
@@ -141,8 +167,9 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/firefox
 %attr(755,root,root) %{_libdir}/%{name}/firefox-bin
 %attr(755,root,root) %{_libdir}/%{name}/minidump-analyzer
-%attr(755,root,root) %{_libdir}/%{name}/precomplete
+%attr(755,root,root) %{_libdir}/%{name}/pingsender
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container
+%attr(755,root,root) %{_libdir}/%{name}/precomplete
 
 %{_libdir}/%{name}/browser/chrome
 %{_libdir}/%{name}/browser/icons
@@ -162,9 +189,15 @@ fi
 %{_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/screenshots@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/shield-recipe-client@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/webcompat@mozilla.org.xpi
 
 %dir %{_libdir}/%{name}/browser/plugins
@@ -178,7 +211,7 @@ fi
 
 %dir %{_libdir}/%{name}/gmp-clearkey
 %dir %{_libdir}/%{name}/gmp-clearkey/0.1
-%{_libdir}/%{name}/gmp-clearkey/0.1/clearkey.info
+%{_libdir}/%{name}/gmp-clearkey/0.1/manifest.json
 %attr(755,root,root) %{_libdir}/%{name}/gmp-clearkey/0.1/libclearkey.so
 
 %{_pixmapsdir}/%{name}.png