From d4a321a598f91cfa632473b8f3fcd58a2993b459 Mon Sep 17 00:00:00 2001 From: Jacek Migacz Date: Wed, 22 Sep 2021 16:56:38 +0200 Subject: [PATCH] Adapt hardening options from _hardened_build macro Resolves: #2006856 --- emacs.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/emacs.spec b/emacs.spec index 8929880..088ea9a 100644 --- a/emacs.spec +++ b/emacs.spec @@ -5,7 +5,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 27.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz @@ -240,8 +240,6 @@ export CFLAGS="-DMAIL_USE_LOCKF %{build_cflags}" mkdir build-gtk && cd build-gtk ln -s ../configure . -LDFLAGS=-Wl,-z,relro; export LDFLAGS; - %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \ --with-xwidgets --with-modules --with-harfbuzz --with-cairo --with-json @@ -253,8 +251,6 @@ cd .. mkdir build-lucid && cd build-lucid ln -s ../configure . -LDFLAGS=-Wl,-z,relro; export LDFLAGS; - %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \ --with-modules --with-harfbuzz --with-cairo --with-json @@ -484,6 +480,9 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg %{_includedir}/emacs-module.h %changelog +* Wed Sep 22 2021 Jacek Migacz - 1:27.2-6 +- Adapt hardening options from _hardened_build macro (#2006856) + * Wed Aug 18 2021 Jacek Migacz - 1:27.2-5 - Provide gating.yaml for CI (#1975151)