Merge branch 'i8c' with version 115.7.0-1 into 'i8'

.firefox.metadata

@@ -1,6 +1,6 @@
 b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
-3f01e727d6f69c743a7fac6ccee8c2feb5c883ff SOURCES/firefox-115.6.0esr.processed-source.tar.xz
-76e4af93eb2372f845f59693b080717beb33d793 SOURCES/firefox-langpacks-115.6.0esr-20231212.tar.xz
+31fb51ff4e90d942af418dfb96679686e11c2f65 SOURCES/firefox-115.7.0esr.processed-source.tar.xz
+4d0d4a0699b692bcd7fa54f36ef1914ca5c4a751 SOURCES/firefox-langpacks-115.7.0esr-20240116.tar.xz
 2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
 d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
 9555ba179bc1398fbacfa2896e45f3808d94ecd2 SOURCES/nss-3.90.0-3.el8_1.src.rpm

.gitignore

@@ -1,6 +1,6 @@
 SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-115.6.0esr.processed-source.tar.xz
-SOURCES/firefox-langpacks-115.6.0esr-20231212.tar.xz
+SOURCES/firefox-115.7.0esr.processed-source.tar.xz
+SOURCES/firefox-langpacks-115.7.0esr-20240116.tar.xz
 SOURCES/mochitest-python.tar.gz
 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
 SOURCES/nss-3.90.0-3.el8_1.src.rpm

SPECS/firefox.spec

@@ -132,7 +132,7 @@ end}
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        115.6.0
+Version:        115.7.0
 Release:        1%{?dist}.inferit
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -163,7 +163,7 @@ ExcludeArch:    aarch64 s390 ppc
 # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz
 Source0:        firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
 %if %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20231212.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20240116.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -1653,6 +1653,17 @@ rm -rf %{buildroot}%{mozappdir}/gtk2/
 ln -sf /usr/lib64/libnss3.so %{buildroot}%{_libdir}/libnss3.so
 ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so
 %endif
+
+# clean the created bundled rpms if there are any
+rm -rf %{_srcrpmdir}/libffi*.src.rpm
+find %{_rpmdir} -name "libffi*.rpm" -delete
+rm -rf %{_srcrpmdir}/openssl*.src.rpm
+find %{_rpmdir} -name "openssl*.rpm" -delete
+rm -rf %{_srcrpmdir}/nss*.src.rpm
+find %{_rpmdir} -name "nss*.rpm" -delete
+rm -rf %{_srcrpmdir}/nspr*.src.rpm
+find %{_rpmdir} -name "nspr*.rpm" -delete
+
 #---------------------------------------------------------------------
 
 %check
@@ -1666,16 +1677,6 @@ if [ $1 -eq 0 ]; then
   %{__rm} -rf %{mozappdir}/plugins
 fi
 
-%clean
-rm -rf %{_srcrpmdir}/libffi*.src.rpm
-find %{_rpmdir} -name "libffi*.rpm" -delete
-rm -rf %{_srcrpmdir}/openssl*.src.rpm
-find %{_rpmdir} -name "openssl*.rpm" -delete
-rm -rf %{_srcrpmdir}/nss*.src.rpm
-find %{_rpmdir} -name "nss*.rpm" -delete
-rm -rf %{_srcrpmdir}/nspr*.src.rpm
-find %{_rpmdir} -name "nspr*.rpm" -delete
-
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -1763,8 +1764,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
-* Mon Mar 18 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 115.6.0-1.inferit
-- Update to 115.6.0-1
+* Mon Mar 18 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 115.7.0-1.inferit
+- Update to 115.7.0-1
+
+* Tue Jan 16 2024 Eike Rathke <erack@redhat.com> - 115.7.0-1
+- Update to 115.7.0 build1
 
 * Thu Dec 14 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 115.5.0-1.inferit
 - Update to 115.5.0-1