From 210e2332d6b283a9d2203d2abd3071b6c96ca129 Mon Sep 17 00:00:00 2001 From: Iñaki Úcar Date: May 24 2022 10:31:39 +0000 Subject: Remove custom stack-protector definition --- diff --git a/rstudio.spec b/rstudio.spec index f6e264c..c01bd81 100644 --- a/rstudio.spec +++ b/rstudio.spec @@ -36,7 +36,7 @@ Name: rstudio Version: %{rstudio_version}+%{rstudio_version_suffix} -Release: 2%{?dist} +Release: 3%{?dist} Summary: RStudio base package # AGPLv3: RStudio, hunspell, tree.hh @@ -182,6 +182,10 @@ ln -sf %{_includedir}/catch2 src/cpp/tests/cpp/tests/vendor # don't include gwt_build in ALL to avoid recompilation sed -i 's@gwt_build ALL@gwt_build@g' src/gwt/CMakeLists.txt +# remove custom stack-protector definition +# https://github.com/rstudio/rstudio/pull/11278 +sed -i '/stack-protector/d' src/cpp/CMakeLists.txt + %build export RSTUDIO_VERSION_MAJOR=%{rstudio_version_major} export RSTUDIO_VERSION_MINOR=%{rstudio_version_minor} @@ -340,6 +344,9 @@ chown -R %{name}-server:%{name}-server %{_sharedstatedir}/%{name}-server %config(noreplace) %{_sysconfdir}/pam.d/%{name} %changelog +* Tue May 24 2022 Iñaki Úcar - 2022.02.2+485-3 +- Remove custom stack-protector definition + * Wed May 04 2022 Thomas Rodgers - 2022.02.2+485-2 - Rebuilt for Boost 1.78