[packages/emacs] - use bash where required
baggins
baggins at pld-linux.org
Sun Dec 25 18:36:49 CET 2016
commit 55ae939e2aaf9719898ca4ed7f427c093f6cc85b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Dec 25 18:36:06 2016 +0100
- use bash where required
bashizm.patch | 8 ++++++++
emacs.spec | 16 +++++++++-------
2 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/emacs.spec b/emacs.spec
index 2e06519..4f16234 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -35,6 +35,7 @@ Source7: %{name}-gtk.desktop
Source8: %{name}-motif.desktop
Source9: %{name}-nox.desktop
Patch0: imagemagick7.patch
+Patch1: bashizm.patch
URL: http://www.gnu.org/software/emacs/
BuildRequires: autoconf
BuildRequires: automake
@@ -370,6 +371,7 @@ exit 1
%setup -q -n %{name}-%{ver}
%patch0 -p1
+%patch1 -p1
%build
cp -f /usr/share/automake/config.* .
@@ -394,7 +396,7 @@ mkdir build-athena && cd build-athena
--with-x-toolkit=athena \
%{?with_bootstrap:--without-gpm}
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
%define bootstrap athena
cd ..
%endif
@@ -415,9 +417,9 @@ mkdir build-gtk && cd build-gtk
%{?with_bootstrap:--without-gpm}
%if %{?bootstrap}
-%{__make}
+%{__make} V=1
%else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
%define bootstrap gtk
%endif
cd ..
@@ -439,9 +441,9 @@ mkdir build-motif && cd build-motif
%{?with_bootstrap:--without-gpm}
%if %{?bootstrap}
-%{__make}
+%{__make} V=1
%else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
%define bootstrap motif
%endif
cd ..
@@ -463,9 +465,9 @@ mkdir build-nox && cd build-nox
%{?with_bootstrap:--without-gpm}
%if %{?bootstrap}
-%{__make}
+%{__make} V=1
%else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
%define bootstrap nox
%endif
cd ..
diff --git a/bashizm.patch b/bashizm.patch
new file mode 100644
index 0000000..ed1edf0
--- /dev/null
+++ b/bashizm.patch
@@ -0,0 +1,8 @@
+--- emacs-25.1/build-aux/make-info-dir.orig 2016-06-29 11:49:16.000000000 +0200
++++ emacs-25.1/build-aux/make-info-dir 2016-12-25 17:58:48.556470701 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ ### make-info-dir - create info/dir, for systems without install-info
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/emacs.git/commitdiff/3044f8ada830453a66ef47b049d4a5088e575a0f
More information about the pld-cvs-commit
mailing list