6 changed files with 154 additions and 159 deletions
--- a/.saab-fonts.metadata
+++ b/.saab-fonts.metadata
@ -0,0 +1 @@
+aa8a32819d51b701a1d45a674d17432937f06ac3 saab.0.91.zip
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/saab-fonts.spec
+++ b/saab-fonts.spec
@ -3,10 +3,9 @@

 Name:        %{fontname}-fonts
 Version:     0.91
-Release:     18%{?dist}
+Release:     25%{?dist}
 Summary:     Free Punjabi Unicode OpenType Serif Font

-Group:       User Interface/X

 License:     GPLv2+ with exceptions
 URL:         http://guca.sourceforge.net/typography/fonts/saab/
@ -47,11 +46,33 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 %doc License_font_exception.txt

 %changelog
-* Sat Aug 07 2021 Parag Nemade <pnemade AT redhat DOT com> - 0.91-18
- Resolves:rhbz#1990809 - Typo in the fontconfig file
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.91-25
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Mon Nov 18 2019 Parag Nemade <pnemade AT redhat DOT com> - 0.91-17
- Resolves:rh#1682210 - Added CI tests
+* Fri Aug 06 2021 Parag Nemade <pnemade AT redhat DOT com> - 0.91-24
+- Resolves:rhbz#1990810 - Typo in the fontconfig file
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.91-23
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (saab.0.91.zip) = d8356d3accc79c3ff8f66bf15708e60a91bb775ca3afe380cbb658f0479e6edbee110287ef1599bc08c2e038e6ea17a19948e501dd0023a7ba9e4230b50b3b15
+73391a1992dc8693f4b9818bde417dd3  saab.0.91.zip
--- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test
+++ b/tests/roles/custom-test-fonts/files/run-lang-coverage-test
@ -1,13 +1,13 @@
 #! /bin/bash -efu

 debug() {
-    if [ -n "$DEBUG" ]; then
-	echo "$*" >&2
-    fi
+	if [ -n "$DEBUG" ]; then
+		echo "$*" >&2
+	fi
 }

 msg_usage() {
-    cat <<_EOF_
+	cat <<_EOF_
 Run language coverage test.

 Usage:
@ -28,7 +28,7 @@ _EOF_
 PROG="${PROG:-${0##*/}}"
 DEBUG="${DEBUG:-}"
 OPT_LANG="${OPT_LANG:-en}"
-OPT_PATH=()
+OPT_PATH="${OPT_PATH:-}"
 OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}"
 OPT_EXCLUDE=()
 OPT_INCLUDE=()
@ -37,91 +37,113 @@ OPT_NAME="${OPT_NAME:-}"
 opt=$(getopt -n "$0" --options "hvl:p:n:a:e:i:" --longoptions "help,verbose,lang:,path:,name:,artifactsdir:,exclude:,include:" -- "$@")
 eval set -- "$opt"
 while [[ $# -gt 0 ]]; do
-    case "$1" in
+	case "$1" in
 	-n|--name)
-	    OPT_NAME="$2"
-	    shift 2
-	    ;;
+		OPT_NAME="$2"
+		shift 2
+		;;
 	-i|--include)
-	    OPT_INCLUDE+=("$2")
-	    shift 2
-	    ;;
+		OPT_INCLUDE+=("$2")
+		shift 2
+		;;
 	-e|--exclude)
-	    OPT_EXCLUDE+=("$2")
-	    shift 2
-	    ;;
+		OPT_EXCLUDE+=("$2")
+		shift 2
+		;;
 	-a|--artifactsdir)
-	    OPT_ARTIFACTS_DIR="$2"
-	    shift 2
-	    ;;
+		OPT_ARTIFACTS_DIR="$2"
+		shift 2
+		;;
 	-p|--path)
-	    OPT_PATH+=("$2")
-	    shift 2
-	    ;;
+		OPT_PATH="$2"
+		shift 2
+		;;
 	-l|--lang)
-	    OPT_LANG="$2"
-	    shift 2
-	    ;;
+		OPT_LANG="$2"
+		shift 2
+		;;
 	-v|--verbose)
-	    DEBUG="-v"
-	    shift
-	    ;;
+		DEBUG="-v"
+		shift
+		;;
 	-h|--help)
-	    msg_usage
-	    exit 0
-	    ;;
+		msg_usage
+		exit 0
+		;;
 	--)
-	    shift
-	    ;;
+		shift
+		;;
 	*)
-	    msg_usage
-	    exit 1
-    esac
+		msg_usage
+		exit 1
+	esac
 done

 if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then
-    echo "Use: $PROG -h for help."
-    exit 0
+	echo "Use: $PROG -h for help."
+	exit 0
 fi

-STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g')
+expand_regex() {
+	local e ret=()
+	local path="$1"
+	shift
+	(cd $path;
+	for e; do
+		debug "$e"
+		set +f
+		local x=$(find -regextype posix-egrep -regex "./$e" -print|sed -e 's,^\./,,g')
+		ret+=($x)
+		set -f
+		echo ${ret[@]}
+	done)
+	echo ${ret[@]}
+}
+
+OPT_INCLUDE=($(expand_regex $OPT_PATH ${OPT_INCLUDE[@]}))
+OPT_EXCLUDE=($(expand_regex $OPT_PATH ${OPT_EXCLUDE[@]}))
+
+debug "Path: $OPT_PATH"
+debug "Lang: $OPT_LANG"
+debug "Artifacts dir: $OPT_ARTIFACTS_DIR"
+debug "Exclude: ${OPT_EXCLUDE[@]}"
+debug "Include: ${OPT_INCLUDE[@]}"
+STR_TEST_DASHED=$(echo "${OPT_NAME:-${OPT_LANG}_${OPT_PATH}}" | sed -e 's/\//-/g')

 clean_exit() {
-    rc=$?;
-    trap - SIGINT SIGTERM SIGABRT EXIT
-    echo "Run test $OPT_LANG: done."
-    for pid in $(ps -o pid --no-headers --ppid $$); do
-	if [ -n "$(ps -p $pid -o pid=)" ]; then
-	    kill -s HUP $pid
+	rc=$?;
+	trap - SIGINT SIGTERM SIGABRT EXIT
+	echo "Run test $OPT_PATH: done."
+	for pid in $(ps -o pid --no-headers --ppid $$); do
+		if [ -n "$(ps -p $pid -o pid=)" ]; then
+			kill -s HUP $pid
+		fi
+	done
+	local log_file_name="$STR_TEST_DASHED.log"
+	local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name"
+	local status
+	if [[ $rc -eq 127 ]]; then
+		status="ERROR"
+	elif grep -q "RESULT: WARN" "$log_file_path"; then
+		status="ERROR"
+	elif grep -q "RESULT: FAIL" "$log_file_path"; then
+		status="FAIL"
+	elif grep -q "RESULT: PASS" "$log_file_path"; then
+		status="PASS"
+	elif grep -q "FAIL" "$log_file_path"; then
+		status="FAIL"
+	elif grep -q "PASS" "$log_file_path"; then
+		status="PASS"
+	else
+		status="ERROR"
 	fi
-    done
-    local log_file_name="$STR_TEST_DASHED.log"
-    local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name"
-    local status
-    if [[ $rc -eq 127 ]]; then
-	status="ERROR"
-    elif grep -q "RESULT: WARN" "$log_file_path"; then
-	status="ERROR"
-    elif grep -q "RESULT: FAIL" "$log_file_path"; then
-	status="FAIL"
-    elif grep -q "RESULT: PASS" "$log_file_path"; then
-	status="PASS"
-    elif grep -q "WARN" "$log_file_path"; then
-	status="ERROR"
-    elif grep -q "FAIL" "$log_file_path"; then
-	status="FAIL"
-    elif grep -q "PASS" "$log_file_path"; then
-	status="PASS"
-    else
-	status="ERROR"
-    fi
-    echo "$status $OPT_LANG" >> "$OPT_ARTIFACTS_DIR/test.log"
-    mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}"
-    local results="$OPT_ARTIFACTS_DIR/results.yml"
-    local result=$(echo $status | tr '[:upper:]' '[:lower:]')
-    test -f "$results" || echo 'results:' > "$results"
-    echo "- {result: $result, test: $OPT_LANG}" >> "$results"
-    exit 0
+	echo "$status $OPT_PATH" >> "$OPT_ARTIFACTS_DIR/test.log"
+	mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}"
+	local results="$OPT_ARTIFACTS_DIR/results.yml"
+	local result=$(echo $status | tr '[:upper:]' '[:lower:]')
+	test -f "$results" || echo 'results:' > "$results"
+	echo "- {result: $result, test: $OPT_PATH}" >> "$results"
+	exit 0
 }
 trap clean_exit SIGINT SIGTERM SIGABRT EXIT

@ -131,94 +153,45 @@ logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log"
 logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log"
 exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4)

-expand_regex() {
-    local p ret=()
-    local regex="$1"
-    shift
-    debug "Expanding $regex"
-    for p; do
-	set +f
-	debug "$p: $regex"
-	 (cd $p;
-	  local x=$(find -regextype posix-egrep -regex "./$regex" -print|sed -e 's,^\./,,g')
-	  debug "$x"
-	  ret+=($x)
-	  set -f
-	  echo -n ${ret[@]}
-	 )
-    done
-    echo -n ${ret[@]}
-}
-
-iv=()
-ev=()
-x=()
-for p in ${OPT_INCLUDE[@]}; do
-    x=$(expand_regex $p ${OPT_PATH[@]})
-    if [ "x$x" == "x" ]; then
-	echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?"
-	continue
-    fi
-    iv=("${iv[@]}" "${x[@]}")
-done
-for p in ${OPT_EXCLUDE[@]}; do
-    x=$(expand_regex $p ${OPT_PATH[@]})
-    if [ "x$x" == "x" ]; then
-	echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?"
-	continue
-    fi
-    ev=("${ev[@]}" "${x[@]}")
-done
-OPT_EXCLUDE=(${ev[@]})
-OPT_INCLUDE=(${iv[@]})
-
-debug "Path: ${OPT_PATH[@]}"
-debug "Lang: $OPT_LANG"
-debug "Artifacts dir: $OPT_ARTIFACTS_DIR"
-debug "Exclude: ${#OPT_EXCLUDE[@]}: ${OPT_EXCLUDE[@]}"
-debug "Include: ${#OPT_INCLUDE[@]}: ${OPT_INCLUDE[@]}"
-
 contains() {
-    local e match="$1"
-    shift
-    for e; do [[ "$e" == "$match" ]] && return 1; done
-    return 0
+	local e match="$1"
+	shift
+	for e; do [[ "$e" == "$match" ]] && return 1; done
+	return 0
 }

 debug "Check language coverage"
 set +f
-for p in ${OPT_PATH[@]}; do
-    for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do
-	set -f
+for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do
+set -f
 	debug "$i"
 	if test -f $i; then
-	    n=`basename $i`
-	    set +e
-	    contains "$n" "${OPT_EXCLUDE[@]}"
-	    ret=$?
-	    set -e
-	    if [ $ret -eq 1 ]; then
-		debug "ignoring $i"
-		continue
-	    fi
-	    if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then
+		n=`basename $i`
 		set +e
-		contains "$n" "${OPT_INCLUDE[@]}"
+		contains "$n" "${OPT_EXCLUDE[@]}"
 		ret=$?
 		set -e
-		if [ $ret -eq 0 ]; then
-		    debug "$i isn't targeted file"
-		    continue
+		if [ $ret -eq 1 ]; then
+			debug "ignoring $i"
+			continue
+		fi
+		if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then
+			set +e
+			contains "$n" "${OPT_INCLUDE[@]}"
+			ret=$?
+			set -e
+			if [ $ret -eq 0 ]; then
+				debug "$i isn't targeted file"
+				continue
+			fi
+		fi
+		debug "  $i"
+		res=`fc-validate -l $OPT_LANG $i`
+		if echo $res | grep -q Missing; then
+			echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage."
+		else
+			echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage."
 		fi
-		NOT_MATCHED=("${NOT_MATCHED[@]/$n}")
-	    fi
-	    debug "  $i"
-	    res=`fc-validate -l $OPT_LANG $i`
-	    if echo $res | grep -q Missing; then
-		echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage."
-	    else
-		echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage."
-	    fi
 	fi
-    done
 done
+
--- a/tests/roles/custom-test-fonts/tasks/main.yml
+++ b/tests/roles/custom-test-fonts/tasks/main.yml
@ -2,7 +2,7 @@

 - block:
  - name: language coverage
-    script: run-lang-coverage-test --lang "{{ item }}" {% if coverage.values is not defined or coverage[item].path_prefix is not defined %} --path {{ path_prefix }} {% else %} {{ '--path "' + (coverage[item].path_prefix | join('" --path "')) + '"' }} {% endif %} --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}}
+    script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}}
    with_items:
    - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}"
  - name: generic family assignment
				`@ -0,0 +1 @@`
				`aa8a32819d51b701a1d45a674d17432937f06ac3 saab.0.91.zip`