Revert "Clean up spec file"

This reverts commit 5469dd0235.
i8ce
Arkady L. Shane 12 months ago
parent 5469dd0235
commit 676d8faba8
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -1,10 +1,3 @@
# Build with GOST patches
# https://github.com/deemru/chromium-gost/
%global gost 1
%define chromium_gost_commit 2c81b2fed144086340d5220ef707350b7fb18ec9
%define msspi_commit 3c50c2d33a4bdf4effb01aaeb9ff5d5b67635a18
%define chromium_path_gost %{_builddir}/chromium-gost
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
# enable|disable system build flags # enable|disable system build flags
@ -239,6 +232,13 @@
%endif %endif
%endif %endif
# Build with GOST patches
# https://github.com/deemru/chromium-gost/
%global gost 1
%define chromium_gost_commit 2c81b2fed144086340d5220ef707350b7fb18ec9
%define msspi_commit 3c50c2d33a4bdf4effb01aaeb9ff5d5b67635a18
%define chromium_path_gost %{_builddir}/chromium-gost
### From 2013 until early 2021, Google permitted distribution builds of ### From 2013 until early 2021, Google permitted distribution builds of
### Chromium to access Google APIs that added significant features to ### Chromium to access Google APIs that added significant features to
### Chromium including, but not limited to, Sync and geolocation. ### Chromium including, but not limited to, Sync and geolocation.
@ -274,7 +274,7 @@
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
Version: 119.0.6045.159 Version: 119.0.6045.159
Release: 2%{?dist}.inferit Release: 1%{?dist}.inferit.gost
Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
Url: http://www.chromium.org/Home Url: http://www.chromium.org/Home
License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only) License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@ -511,12 +511,12 @@ BuildRequires: binutils
#BuildRequires: pkgconfig(libavutil) #BuildRequires: pkgconfig(libavutil)
# chromium fail to start for rpmfusion users due to ABI break in ffmpeg-free-6.0.1 # chromium fail to start for rpmfusion users due to ABI break in ffmpeg-free-6.0.1
# bethween fedora and rpmfussion. # bethween fedora and rpmfussion.
#%%if 0%%{?rhel} == 9 || 0%%{?fedora} == 37 #%%if 0%{?rhel} == 9 || 0%%{?fedora} == 37
#Conflicts: libavformat-free%%{_isa} < 5.1.4 #Conflicts: libavformat-free%{_isa} < 5.1.4
#Conflicts: ffmpeg-libs%%{_isa} < 5.1.4 #Conflicts: ffmpeg-libs%{_isa} < 5.1.4
#%%else #%%else
#Conflicts: libavformat-free%%{_isa} < 6.0.1 #Conflicts: libavformat-free%{_isa} < 6.0.1
#Conflicts: ffmpeg-libs%%{_isa} < 6.0.1-2 #Conflicts: ffmpeg-libs%{_isa} < 6.0.1-2
#%%endif #%%endif
#%%endif #%%endif
@ -899,7 +899,7 @@ Provides: %{name}-gost-lib = %{version}-%{release}
%description %description
Chromium is an open-source web browser, powered by WebKit (Blink). Chromium is an open-source web browser, powered by WebKit (Blink).
%if %{gost} %if %{gost}
Chromium GOST patches are integrated, this Chromium supports GOST TLS chromium-gost patches are integrated, this Chromium supports GOST TLS
if proprietary CryptoPro is installed. if proprietary CryptoPro is installed.
%endif %endif
@ -1802,7 +1802,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver %{chromium_path}/chromedriver
%changelog %changelog
* Sat Nov 25 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 119.0.6045.159-2.inferit * Sat Nov 25 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 119.0.6045.159-1.inferit.gost
- Apply GOST patches - Apply GOST patches
* Mon Nov 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 119.0.6045.159-1.inferit * Mon Nov 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 119.0.6045.159-1.inferit

Loading…
Cancel
Save