Merge branch 'c8' into a8

2024-04-19 16:17:50 +03:00 · 2024-04-01 08:40:08 +00:00 · 2024-02-27 15:46:00 +03:00 · 2024-01-31 10:07:19 +03:00 · 2024-01-04 10:27:46 +03:00 · 2023-11-29 12:21:38 +04:00
3 changed files with 10 additions and 16 deletions
--- a/SOURCES/distribution.ini
+++ b/SOURCES/distribution.ini
@ -1,9 +1,9 @@
 [Global]
-id=fedora
+id=almalinux
 version=1.0
-about=Mozilla Firefox for Fedora
+about=Mozilla Firefox for AlmaLinux

 [Preferences]
-app.distributor=fedora
-app.distributor.channel=fedora
-app.partner.fedora=fedora
+app.distributor=almalinux
+app.distributor.channel=almalinux
+app.partner.fedora=almalinux
--- a/SOURCES/firefox-almalinux-default-prefs.js
+++ b/SOURCES/firefox-almalinux-default-prefs.js
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@ -133,7 +133,7 @@ end}
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        115.10.0
-Release:        1%{?dist}
+Release:        1%{?dist}.alma.1
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+

@ -168,7 +168,7 @@ Source1:        firefox-langpacks-%{version}%{?pre_version}-20240409.tar.xz
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
 Source10:       firefox-mozconfig
-Source12:       firefox-redhat-default-prefs.js
+Source12:       firefox-almalinux-default-prefs.js
 Source20:       firefox.desktop
 Source21:       firefox.sh.in
 Source23:       firefox.1
@ -1740,6 +1740,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------

 %changelog
+* Fri Apr 19 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.10.0-1.alma.1
+- Debrand for AlmaLinux
+
 * Tue Apr 09 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1
 - Update to 115.10.0 build1

@ -1793,7 +1796,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

 * Thu May 04 2023 Eike Rathke <erack@redhat.com> - 102.11.0-2
 - Update to 102.11.0 build2
-
 * Tue May 02 2023 Eike Rathke <erack@redhat.com> - 102.11.0-1
 - Update to 102.11.0 build1

@ -1802,7 +1804,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

 * Fri Mar 10 2023 Eike Rathke <erack@redhat.com> - 102.9.0-4
 - Update to 102.9.0 build2
-
 * Thu Mar 09 2023 Jan Horak <jhorak@redhat.com> - 102.9.0-2
 - removed disable-openh264-download

@ -1811,31 +1812,25 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

 * Tue Feb 14 2023 Eike Rathke <erack@redhat.com> - 102.8.0-2
 - Update to 102.8.0 build2
-
 * Tue Feb 07 2023 Eike Rathke <erack@redhat.com> - 102.8.0-1
 - Update to 102.8.0 build1

 * Tue Jan 10 2023 Eike Rathke <erack@redhat.com> - 102.7.0-1
 - Update to 102.7.0 build1
-
 * Mon Jan 02 2023 Jan Horak <jhorak@redhat.com> - 102.6.0-2
 - Add firefox-x11 subpackage to allow explicit run of firefox under x11 on RHEL9

 * Tue Dec 06 2022 Eike Rathke <erack@redhat.com> - 102.6.0-1
 - Update to 102.6.0 build1
-
 * Fri Nov 25 2022 Jan Horak <jhorak@redhat.com> - 102.5.0-2
 - Added libwebrtc screencast patch for newer features

 * Wed Nov 09 2022 Eike Rathke <erack@redhat.com> - 102.5.0-1
 - Update to 102.5.0 build1
-
 * Wed Oct 12 2022 Eike Rathke <erack@redhat.com> - 102.4.0-1
 - Update to 102.4.0 build1
-
 * Tue Oct 11 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-7
 - Fix for expat CVE-2022-40674 and non functional webrtc
-
 * Tue Sep 13 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-6
 - Update to 102.3.0 build1

@ -2239,4 +2234,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

 * Thu Dec  8 2016 Jan Horak <jhorak@redhat.com> - 52.0-0.5
 - Firefox Aurora 52 testing build
-
Author	SHA1	Message	Date
eabdullin	2d06094ecf	Merge branch 'c8' into a8	2024-04-19 16:17:50 +03:00
Andrew Lukoshko	646c517f54	Merge branch 'c8' into a8	2024-04-01 08:40:08 +00:00
eabdullin	ed3e9312d8	Merge branch 'c8' into a8	2024-02-27 15:46:00 +03:00
eabdullin	fb17fd17a8	Merge branch 'c8' into a8	2024-01-31 10:07:19 +03:00
eabdullin	e18aeba8d2	Merge branch 'c8' into a8	2024-01-04 10:27:46 +03:00
eabdullin	04876bb865	Merge branch 'c8' into a8	2023-11-29 12:21:38 +04:00
eabdullin	59db145c1d	Merge branch 'c8' into a8	2023-11-02 11:46:46 +03:00
eabdullin	21d5ccd0e4	Fix date	2023-10-05 18:38:32 +03:00
eabdullin	552d9f0e32	Merge branch 'c8' into a8	2023-10-05 18:29:23 +03:00
eabdullin	fe84804e74	Merge branch 'c8' into a8	2023-09-20 11:42:30 +03:00
eabdullin	d3d52efa09	Merge branch 'c8' into a8	2023-09-05 22:34:16 +03:00
eabdullin	6f633d1055	Merge branch 'c8' into a8	2023-08-04 17:25:55 +03:00
eabdullin	9aa9900f52	Merge branch 'c8' into a8	2023-07-14 11:25:13 +03:00
eabdullin	fd99a5867f	Merge branch 'c8' into a8	2023-05-18 06:16:36 +00:00
eabdullin	cab6c6dbe5	Merge branch 'c8' into a8	2023-04-14 13:11:13 +00:00
eabdullin	6964dcd748	Merge branch 'c8' into a8	2023-03-20 09:22:56 +00:00
eabdullin	dcce0e3ca8	Remove definition of dist	2023-02-22 14:48:15 +03:00
eabdullin	b6787ce4fb	Merge branch 'c8' into a8	2023-02-20 08:00:53 +00:00
eabdullin	b7aef6013b	Merge branch 'c8' into a8	2023-01-23 08:26:41 +00:00
eabdullin	822dbdd442	Merge branch 'c8' into a8	2022-12-15 15:34:20 +00:00
eabdullin	251f813b02	Merge branch 'c8' into a8	2022-11-21 12:39:44 +00:00
eabdullin	d718fd7570	Merge branch 'c8' into a8	2022-10-20 14:33:00 +00:00
eabdullin	5c283a3a94	Merge branch 'c8' into a8	2022-10-18 18:39:58 +00:00
Andrew Lukoshko	8089b206bf	Merge remote-tracking branch 'origin/c8' into a8	2022-09-26 20:47:11 +00:00
eabdullin	0e5083ed77	Merge branch 'c8' into a8	2022-08-24 18:00:50 +00:00
eabdullin	bd58103f3e	Merge branch 'c8' into a8	2022-08-01 09:03:51 +00:00
eabdullin	a76ec55d70	Merge branch 'c8' into a8	2022-06-30 23:25:31 +00:00
eabdullin	e81c9a95f7	Added changelog line	2022-06-01 18:41:14 +03:00
Stepan Oksanichenko	cfd8f3e52e	Merge remote-tracking branch 'alma-origin/c8' into HEAD	2022-06-01 15:28:21 +00:00
Stepan Oksanichenko	5fe78972e6	Merge remote-tracking branch 'alma-origin/c8' into HEAD	2022-05-26 11:07:50 +00:00
Stepan Oksanichenko	748ab73828	Merge remote-tracking branch 'alma-origin/c8' into HEAD	2022-05-04 11:07:04 +00:00
Stepan Oksanichenko	894d34e0d2	Merge remote-tracking branch 'alma-origin/c8' into HEAD	2022-04-10 21:00:39 +00:00
Stepan Oksanichenko	366328e182	Merge remote-tracking branch 'alma-origin/c8' into HEAD	2022-03-10 14:39:38 +00:00
Stepan Oksanichenko	702a50d837	Merge remote-tracking branch 'alma-origin/c8' into HEAD	2022-02-14 08:17:01 +00:00
Stepan Oksanichenko	bf3904caf8	Merge remote-tracking branch 'alma-origin/c8' into HEAD	2022-01-12 11:32:54 +00:00
eabdullin	075a817284	Merge branch 'c8' into a8	2021-12-23 13:32:16 +03:00
eabdullin	592542490e	AlmaLinux changes	2021-11-17 15:01:46 +03:00
Andrew Lukoshko	61ed7ebc99	Merge branch 'c8' into a8	2021-10-21 15:32:54 +00:00
Andrew Lukoshko	14135a8233	AlmaLinux changes	2021-09-15 09:10:47 +00:00