Merge branch 'c9' into a9
This commit is contained in:
commit
ec4341964e
@ -1,6 +1,6 @@
|
|||||||
b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
|
b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
|
||||||
f19b5467588701056ebbecc4e4e1e12a07be06f5 SOURCES/firefox-115.5.0esr.processed-source.tar.xz
|
3f01e727d6f69c743a7fac6ccee8c2feb5c883ff SOURCES/firefox-115.6.0esr.processed-source.tar.xz
|
||||||
04fd448a519fc232595fdff573e38c7d5daa1d05 SOURCES/firefox-langpacks-115.5.0esr-20231114.tar.xz
|
76e4af93eb2372f845f59693b080717beb33d793 SOURCES/firefox-langpacks-115.6.0esr-20231212.tar.xz
|
||||||
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
|
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
|
||||||
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
|
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
|
||||||
9555ba179bc1398fbacfa2896e45f3808d94ecd2 SOURCES/nss-3.90.0-3.el8_1.src.rpm
|
9555ba179bc1398fbacfa2896e45f3808d94ecd2 SOURCES/nss-3.90.0-3.el8_1.src.rpm
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,6 +1,6 @@
|
|||||||
SOURCES/cbindgen-vendor.tar.xz
|
SOURCES/cbindgen-vendor.tar.xz
|
||||||
SOURCES/firefox-115.5.0esr.processed-source.tar.xz
|
SOURCES/firefox-115.6.0esr.processed-source.tar.xz
|
||||||
SOURCES/firefox-langpacks-115.5.0esr-20231114.tar.xz
|
SOURCES/firefox-langpacks-115.6.0esr-20231212.tar.xz
|
||||||
SOURCES/mochitest-python.tar.gz
|
SOURCES/mochitest-python.tar.gz
|
||||||
SOURCES/nspr-4.35.0-1.el8_1.src.rpm
|
SOURCES/nspr-4.35.0-1.el8_1.src.rpm
|
||||||
SOURCES/nss-3.90.0-3.el8_1.src.rpm
|
SOURCES/nss-3.90.0-3.el8_1.src.rpm
|
||||||
|
@ -132,8 +132,8 @@ end}
|
|||||||
|
|
||||||
Summary: Mozilla Firefox Web browser
|
Summary: Mozilla Firefox Web browser
|
||||||
Name: firefox
|
Name: firefox
|
||||||
Version: 115.5.0
|
Version: 115.6.0
|
||||||
Release: 1%{?dist}.alma.1
|
Release: 1%{?dist}.alma
|
||||||
URL: https://www.mozilla.org/firefox/
|
URL: https://www.mozilla.org/firefox/
|
||||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
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
|
# 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
|
Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
|
||||||
%if %{with langpacks}
|
%if %{with langpacks}
|
||||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20231114.tar.xz
|
Source1: firefox-langpacks-%{version}%{?pre_version}-20231212.tar.xz
|
||||||
%endif
|
%endif
|
||||||
Source2: cbindgen-vendor.tar.xz
|
Source2: cbindgen-vendor.tar.xz
|
||||||
Source3: process-official-tarball
|
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/libnss3.so %{buildroot}%{_libdir}/libnss3.so
|
||||||
ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so
|
ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so
|
||||||
%endif
|
%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
|
%check
|
||||||
@ -1644,16 +1655,6 @@ if [ $1 -eq 0 ]; then
|
|||||||
%{__rm} -rf %{mozappdir}/plugins
|
%{__rm} -rf %{mozappdir}/plugins
|
||||||
fi
|
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
|
%post
|
||||||
update-desktop-database &> /dev/null || :
|
update-desktop-database &> /dev/null || :
|
||||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||||
@ -1739,9 +1740,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Nov 29 2023 Eduard Abdullin <eabdullin@almalinux.org> - 115.5.0-1.alma.1
|
* Wed Jan 03 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.6.0-1.alma
|
||||||
- Debrand for AlmaLinux
|
- Debrand for AlmaLinux
|
||||||
|
|
||||||
|
* Tue Dec 12 2023 Eike Rathke <erack@redhat.com> - 115.6.0-1
|
||||||
|
- Update to 115.6.0 build1
|
||||||
* Tue Nov 14 2023 Eike Rathke <erack@redhat.com> - 115.5.0-1
|
* Tue Nov 14 2023 Eike Rathke <erack@redhat.com> - 115.5.0-1
|
||||||
- Update to 115.5.0 build1
|
- Update to 115.5.0 build1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user