X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox-bin.spec;h=d7f278a50f94fcfd8b00a60f6a7d414ebca5eec1;hb=aa681cc;hp=bb055ab12692d62c2c82154fb6692e9d481be560;hpb=8ea5c50f6ff0a878b34b6e8d04091ead289b3765;p=packages%2Fmozilla-firefox-bin.git diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec index bb055ab..d7f278a 100644 --- a/mozilla-firefox-bin.spec +++ b/mozilla-firefox-bin.spec @@ -1,7 +1,7 @@ # 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 +%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: 57.0 +Version: 85.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: 3183ff5bad59a709b9e9167985a79763 +# Source0-md5: 9a936cbd7c7b1a5ec1a2143c35bbfe48 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: 3cd253e5d7ad278ae3d646b7b8fe112a +# Source1-md5: 97de4f78ebba817cd64c365ae329916f Source2: %{name}.desktop Source3: %{name}.sh URL: https://www.mozilla.org/firefox/ @@ -27,12 +27,12 @@ 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} +Requires: glib2 >= 1:2.42 %{?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.29 +Requires: nss >= 1:3.60.1 +%{?with_system_sqlite:Requires: sqlite3 >= 3.31.1} Suggests: pulseaudio Provides: wwwbrowser Obsoletes: mozilla-firebird @@ -81,14 +81,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 @@ -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,12 +144,8 @@ 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 -%{_libdir}/%{name}/browser/chrome.manifest %{_libdir}/%{name}/browser/omni.ja %{_libdir}/%{name}/omni.ja @@ -172,38 +158,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/clicktoplay-rollout@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/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/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