diff --git a/.firefox.metadata b/.firefox.metadata index 2f4bf91..51b048b 100644 --- a/.firefox.metadata +++ b/.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 2dbf669fa4742e7065cc54cec19f96423032658b SOURCES/firefox-symbolic.svg 2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index 9d64ec1..acf9fad 100644 --- a/.gitignore +++ b/.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/firefox-symbolic.svg SOURCES/mochitest-python.tar.gz SOURCES/nspr-4.35.0-1.el8_1.src.rpm diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 7fa866b..03d88d0 100644 --- a/SPECS/firefox.spec +++ b/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} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -153,7 +153,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -163,7 +163,7 @@ ExcludeArch: 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 @@ -1631,6 +1631,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 @@ -1644,16 +1655,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 || : @@ -1739,6 +1740,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Jan 16 2024 Eike Rathke - 115.7.0-1 +- Update to 115.7.0 build1 + * Tue Dec 12 2023 Eike Rathke - 115.6.0-1 - Update to 115.6.0 build1