Accepting request 1004899 from Base:System

- Enable parallel builds by slpitting clean and all at make time
  (Thanks to Christopher Yeleighton)
- Do not copy more than 1 byte for \(aq becoming a "'" in
  quotes-man2html.patch

- Small change in quotes-man2html.patch
  * Use a simple "'" aka quote instead of "′" for "\(aq"

- Add patch quotes-man2html.patch
  * Fix boo#1203091 -- BASH(1) Manual Page: Unprocessed macro aq

OBS-URL: https://build.opensuse.org/request/show/1004899
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=179

bash.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Sep 20 06:59:04 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- Enable parallel builds by slpitting clean and all at make time
+  (Thanks to Christopher Yeleighton)
+- Do not copy more than 1 byte for \(aq becoming a "'" in
+  quotes-man2html.patch
+
+-------------------------------------------------------------------
+Mon Sep 19 13:11:05 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- Small change in quotes-man2html.patch
+  * Use a simple "'" aka quote instead of "&prime;" for "\(aq"
+
+-------------------------------------------------------------------
+Thu Sep 15 13:09:24 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- Add patch quotes-man2html.patch
+  * Fix boo#1203091 -- BASH(1) Manual Page: Unprocessed macro aq 
+
 -------------------------------------------------------------------
 Thu Apr 28 19:00:17 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

bash.spec

@@ -82,6 +82,8 @@ Patch47:        bash-4.3-perl522.patch
 Patch48:        bash-4.3-extra-import-func.patch
 # PATCH-EXTEND-SUSE Allow root to clean file system if filled up
 Patch49:        bash-4.3-pathtemp.patch
+# PATCH-FIX-SUSE
+Patch50:        quotes-man2html.patch
 BuildRequires:  autoconf
 BuildRequires:  bison
 BuildRequires:  fdupes
@@ -222,13 +224,12 @@ Legacy usrmove helper files for the build system. Do not install.
 
 %prep
 %if %{with sjis}
-echo -e '\033[1m\033[31mWarning: Shift JIS support is enabled\033[m'
+%{warn:Shift JIS support is enabled}
 %else
-echo -e '\033[1m\032[31mShift JIS support disabled\033[m'
+%{echo:Shift JIS support disabled}
 %endif
 %setup -q -n bash-%{bversion}%{bextend} -b1
 typeset -i level
-set +x
 for patch in ../bash-%{bversion}-patches/*-*[0-9]; do
     test -e $patch || break
 
@@ -243,7 +244,6 @@ for patch in ../bash-%{bversion}-patches/*-*[0-9]; do
     echo Patch $patch
     patch -s -p$level < $patch
 done
-set -x
 %patch1   -b .manual
 %patch3   -b .2.4.4
 %patch4   -b .evalexp
@@ -267,6 +267,7 @@ set -x
 %patch48 -b .eif
 %endif
 %patch49  -b .pthtmp
+%patch50  -b .qd
 %patch0   -b .0
 
 # This has to be always the same version as included in the bash its self
@@ -449,23 +450,23 @@ test ${rl1[2]} = ${rl2[2]} || exit 1
   profilecflags=CFLAGS="$CFLAGS %{cflags_profile_generate}"
 %endif
   makeopts="Machine=${HOSTTYPE} OS=${OSTYPE} VENDOR=${VENDOR} MACHTYPE=${MACHTYPE}"
-  make $makeopts "$profilecflags" \
+  %make_build $makeopts "$profilecflags" \
 	all printenv recho zecho xcase
   TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1
   > $SCREENLOG
   tail -q -s 0.5 -f $SCREENLOG & pid=$!
   env -i HOME=$PWD TERM=$TERM LD_LIBRARY_PATH=$LD_RUN_PATH TMPDIR=$TMPDIR \
 	SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \
-	screen -D -m make TESTSCRIPT=%{SOURCE4} check
+	screen -D -m %make_build TESTSCRIPT=%{SOURCE4} check
   kill -TERM $pid
 %if 0%{?do_profiling}
   rm -f jobs.gcda
   profilecflags=CFLAGS="$CFLAGS %{cflags_profile_feedback} -fprofile-correction"
-  clean=clean
+  %make_build $makeopts "$profilecflags" clean
 %endif
-  make $makeopts "$profilecflags" $clean all
+  %make_build $makeopts "$profilecflags" all
-  make $makeopts -C examples/loadables/
+  %make_build $makeopts -C examples/loadables/
-  make $makeopts documentation
+  %make_build $makeopts documentation
 
 %install
   %make_install

quotes-man2html.patch

@@ -0,0 +1,27 @@
+boo#1203091
+
+---
+ support/man2html.c |   12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- support/man2html.c
++++ support/man2html.c	2022-09-12 08:27:06.352648345 +0000
+@@ -476,6 +476,18 @@ expand_char(int nr)
+ 	charb[0] = nr / 256;
+ 	charb[1] = nr % 256;
+ 	charb[2] = '\0';
++	if (charb[1] == 'q') {
++		switch (charb[0]) {
++		case 'a':
++		    strncpy(charb, "'", 1);
++		    charb[1] = '\0';
++		    break;
++		case 'd':
++		    strncpy(charb, """, 6);
++		    charb[6] = '\0';
++		    break;
++		}
++	}
+ 	if (charb[0] == '<') {	/* Fix up <= */
+ 		charb[4] = charb[1];
+ 		strncpy(charb, "&lt;", 4);