rpms/emacs
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use macros where appropriate

Browse Source
This commit is contained in:
Dan Čermák 2020-04-16 22:00:38 +02:00
parent 6f367bc62e
commit 662bd4a9f9
No known key found for this signature in database
GPG Key ID: 8F8C178E966641D3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emacs.spec
View File

@ -28,7 +28,7 @@ Source10: %{name}.appdata.xml
Patch1: emacs-spellchecker.patch Patch1: emacs-spellchecker.patch
Patch2: emacs-system-crypto-policies.patch Patch2: emacs-system-crypto-policies.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: atk-devel BuildRequires: atk-devel
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
@ -229,7 +229,8 @@ ln -s ../../%{name}/%{version}/etc/NEWS doc
%build %build
export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" export CFLAGS="-DMAIL_USE_LOCKF %{build_cflags}"
%set_build_flags
# Build GTK+ binary # Build GTK+ binary
mkdir build-gtk && cd build-gtk mkdir build-gtk && cd build-gtk
@ -241,7 +242,7 @@ LDFLAGS=-Wl,-z,relro; export LDFLAGS;
--with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \ --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
--with-xwidgets --with-modules --with-xwidgets --with-modules
make bootstrap make bootstrap
%{setarch} make %{?_smp_mflags} %{setarch} %make_build
cd .. cd ..
# Build Lucid binary # Build Lucid binary
@ -254,14 +255,14 @@ LDFLAGS=-Wl,-z,relro; export LDFLAGS;
--with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \ --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \
--with-modules --with-modules
make bootstrap make bootstrap
%{setarch} make %{?_smp_mflags} %{setarch} %make_build
cd .. cd ..
# Build binary without X support # Build binary without X support
mkdir build-nox && cd build-nox mkdir build-nox && cd build-nox
ln -s ../configure . ln -s ../configure .
%configure --with-x=no --with-modules %configure --with-x=no --with-modules
%{setarch} make %{?_smp_mflags} %{setarch} %make_build
cd .. cd ..
# Remove versioned file so that we end up with .1 suffix and only one DOC file # Remove versioned file so that we end up with .1 suffix and only one DOC file