From 51dcdcb4a40100986064dab7285b88cafc732589 Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 16 Jun 2024 15:22:35 +0300 Subject: [PATCH] Fix gost build --- SPECS/chromium.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 84ae4b65..efd9a61b 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -33,9 +33,6 @@ export NINJA_STATUS="[%2:%f/%t] " ; \ ninja -j %{numjobs} -C '%1' '%2' -# enable|disable chromedriver -%global build_chromedriver 1 - # enable|disable headless client build %if %{with gost} %global build_headless 0 @@ -995,7 +992,7 @@ Requires: libcanberra-gtk3%{_isa} Requires: u2f-hidraw-policy %endif -Requires: chromium-common%{_isa} = %{version}-%{release} +Requires: %{name}-common%{_isa} = %{version}-%{release} # rhel 7: x86_64 # rhel 8 or newer: x86_64, aarch64 @@ -1178,7 +1175,7 @@ Requires(preun): systemd Requires(postun): systemd Requires: xorg-x11-server-Xvfb Requires: python3-psutil -Requires: chromium-common%{_isa} = %{version}-%{release} +Requires: %{name}-common%{_isa} = %{version}-%{release} Summary: Remote desktop support for google-chrome & chromium %description -n chrome-remote-desktop @@ -1187,7 +1184,7 @@ Remote desktop support for google-chrome & chromium. %package -n chromedriver Summary: WebDriver for Google Chrome/Chromium -Requires: chromium-common%{_isa} = %{version}-%{release} +Requires: %{name}-common%{_isa} = %{version}-%{release} %description -n chromedriver WebDriver is an open source tool for automated testing of webapps across many @@ -1198,7 +1195,7 @@ members of the Chromium and WebDriver teams. %package headless Summary: A minimal headless shell built from Chromium -Requires: chromium-common%{_isa} = %{version}-%{release} +Requires: %{name}-common%{_isa} = %{version}-%{release} %description headless A minimal headless client built from Chromium. headless_shell is built @@ -2070,8 +2067,8 @@ popd %endif # Add directories for policy management -mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/managed -mkdir -p %{buildroot}%{_sysconfdir}/chromium/policies/recommended +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/policies/managed +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/policies/recommended cp -a out/Release/gen/chrome/app/policy/common/html/en-US/*.html . cp -a out/Release/gen/chrome/app/policy/linux/examples/chrome.json . @@ -2145,7 +2142,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %doc AUTHORS README.fedora %doc chrome_policy_list.html *.json %license LICENSE -%config(noreplace) %{_sysconfdir}/%{name}/chromium.conf +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config %{_sysconfdir}/%{name}/master_preferences %config %{_sysconfdir}/%{name}/policies/ %if %{build_remoting}