diff -r 7a49806c8dae -r 48d794331fce MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Fri Jun 08 22:09:15 2018 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Sat Jun 23 17:01:35 2018 +0200 @@ -19,10 +19,10 @@ # changed with every update %define major 60 -%define mainver %major.0.2 -%define update_channel release +%define mainver %major.1.0 +%define update_channel esr %define branding 1 -%define releasedate 20180605171542 +%define releasedate 20180621121604 %define source_prefix firefox-%{mainver} # PIE, full relro (x86_64 for now) @@ -122,13 +122,13 @@ License: MPL-2.0 Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ -Source: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz +Source: http://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz Source1: MozillaFirefox.desktop Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in Source5: source-stamp.txt Source6: kde.js -Source7: l10n-%{version}.tar.xz +Source7: l10n-%{version}esr.tar.xz Source8: firefox-mimeinfo.xml Source9: firefox.js Source10: compare-locales.tar.xz @@ -143,7 +143,7 @@ # please get your own set of keys. Source18: mozilla-api-key Source19: google-api-key -Source20: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz.asc +Source20: http://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz.asc Source21: mozilla.keyring # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch @@ -156,8 +156,6 @@ Patch8: mozilla-bmo256180.patch Patch9: mozilla-i586-DecoderDoctorLogger.patch Patch10: mozilla-i586-domPrefs.patch -Patch11: mozilla-enable-csd.patch -Patch12: mozilla-fix-skia-aarch64.patch Patch13: mozilla-bmo1375074.patch # Firefox/browser Patch101: firefox-kde.patch @@ -272,8 +270,6 @@ %patch9 -p1 %patch10 -p1 %endif -%patch11 -p1 -%patch12 -p1 %patch13 -p1 # Firefox %patch101 -p1