1 files changed, 11 insertions, 19 deletions
diff --git a/emacs.spec b/emacs.spec
index af4b383..22ecd83 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -72,6 +72,7 @@ BuildRequires: ncurses-devel
 BuildRequires: sqlite-devel
 BuildRequires: zlib-devel
 BuildRequires: Xaw3d-devel
+BuildRequires: /usr/bin/makeinfo
 
 %ifarch %{ix86}
 BuildRequires: util-linux
@@ -198,40 +199,33 @@ ln -s ../../%{name}/%{version}/etc/NEWS doc
 export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS -fPIE"
 
 # Build GTK+ binary
-mkdir build-gtk && cd build-gtk
-ln -s ../configure .
-
+mkdir build-gtk && pushd build-gtk
+%global _configure ../configure
 %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg --without-gconf \
            --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
            --with-harfbuzz --with-cairo --with-json \
-           --with-xwidgets --with-modules --without-libotf --without-m17n-flt --without-imagemagick
+           --with-xwidgets --with-modules --without-libotf --without-m17n-flt
 %make_build bootstrap
 %{setarch} %make_build
-cd ..
+popd
 
 # Build Lucid binary
 %if !%{with bootstrap}
-mkdir build-lucid && cd build-lucid
-ln -s ../configure .
-
+mkdir build-lucid && pushd build-lucid
 %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg --without-gconf \
            --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \
            --with-harfbuzz --with-cairo --with-json \
-           --with-modules --without-libotf --without-m17n-flt --without-imagemagick
+           --with-modules --without-libotf --without-m17n-flt
 %make_build bootstrap
 %{setarch} %make_build
-cd ..
+popd
 %endif
 
 # Build binary without X support
-mkdir build-nox && cd build-nox
-ln -s ../configure .
-
-LDFLAGS="-Wl,-z,relro,-z,now -pie";  export LDFLAGS;
-
+mkdir build-nox && pushd build-nox
 %configure --with-x=no --with-modules --with-json --without-gconf
 %{setarch} %make_build
-cd ../
+popd
 
 # Generate pkgconfig file
 cat > emacs.pc << EOF
@@ -254,9 +248,7 @@ cat > macros.emacs << EOF
 EOF
 
 %install
-cd build-gtk
-%make_install
-cd ..
+%make_install -C build-gtk
 
 rm %{buildroot}%{_bindir}/emacs
 touch %{buildroot}%{_bindir}/emacs