.gitignore

@@ -1 +1,9 @@
-SOURCES/3.0.2.tar.gz
+/Overpass-Fonts-1.01.tar.gz
+/Overpass_TTF_Fonts.zip
+/overpass-fonts-ttf-2.zip
+/overpass-fonts-ttf-2.1.zip
+/Overpass-Desktop-Fonts.zip
+/3.0.tar.gz
+/3.0.2.tar.gz
+/3.0.3.tar.gz
+/3.0.4.tar.gz

.overpass-fonts.metadata

@@ -1 +0,0 @@
-9dbd25c883c6ba98798a532bfa9d3343af14f269 SOURCES/3.0.2.tar.gz

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

overpass-fonts-fontconfig.conf

@@ -2,15 +2,15 @@
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
  <alias>
-    <family>Overpass</family>
+    <family>sans-serif</family>
     <prefer>
-      <family>sans-serif</family>
+      <family>Overpass</family>
     </prefer>
   </alias>
   <alias>
-    <family>sans-serif</family>
+    <family>Overpass</family>
     <default>
-      <family>Overpass</family>
+      <family>sans-serif</family>
     </default>
   </alias>
 </fontconfig>

overpass-fonts.spec

@@ -3,8 +3,8 @@
 %global monofontconf 60-%{fontname}-mono.conf
 
 Name:		%{fontname}-fonts
-Version:	3.0.2
-Release:	3%{?dist}
+Version:	3.0.4
+Release:	8%{?dist}
 Summary:	Typeface based on the U.S. interstate highway road signage type system
 License:	OFL or LGPLv2+
 URL:		https://github.com/RedHatBrand/overpass/
@@ -55,6 +55,12 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 ln -s %{_fontconfig_templatedir}/%{monofontconf} \
                 %{buildroot}%{_fontconfig_confdir}/%{monofontconf}
 
+# I do not think this is useful to package, but if it is...
+%if 0
+mkdir -p %{buildroot}/usr/lib/node_modules/overpass/
+cp -a bower.json package.json %{buildroot}/usr/lib/node_modules/overpass/
+%endif
+
 # Add AppStream metadata
 install -Dm 0644 -p %{SOURCE2} \
 	%{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
@@ -66,6 +72,9 @@ install -Dm 0644 -p %{SOURCE4} \
 %doc README.md overpass-specimen.pdf
 %license LICENSE.md
 %{_datadir}/appdata/%{fontname}.metainfo.xml
+%if 0
+/usr/lib/node_modules/overpass/
+%endif
 
 %_font_pkg -n overpass-mono -f %{monofontconf} overpass-mono-*.otf
 %doc README.md overpass-mono-specimen.pdf
@@ -73,6 +82,43 @@ install -Dm 0644 -p %{SOURCE4} \
 %{_datadir}/appdata/%{fontname}-mono.metainfo.xml
 
 %changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.4-8
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri May 21 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.0.4-7
+- Resolves:rhbz#1961999 - Add gating tests
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.4-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Dec  6 2019 Tom Callaway <spot@fedoraproject.org> - 3.0.4-2
+- fix incorrect fontconfig file (thanks to lazybvr)
+
+* Tue Nov 26 2019 Tom Callaway <spot@fedoraproject.org> - 3.0.4-1
+- update to 3.0.4
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon May 21 2018 Tom Callaway <spot@fedoraproject.org> - 3.0.3-1
+- update to 3.0.3
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -0,0 +1 @@
+SHA512 (3.0.4.tar.gz) = a11f4fdcfbe7534bcb822ddbd1e9a8e72b47f04cb70674073917888e70f0df74cf1e86b2ed2fa73e2c6c6768b8c02333b0a7f1b676c626eb331b3fa1458ac2bb

tests/roles/custom-test-fonts/defaults/main.yml

@@ -0,0 +1,7 @@
+---
+
+role_pkgs_req:
+  - fontconfig
+  - fontconfig-devel
+  - pkg-config
+  - rsync

tests/roles/custom-test-fonts/files/run-family-test

@@ -0,0 +1,153 @@
+#! /bin/bash -efu
+
+debug() {
+	if [ -n "$DEBUG" ]; then
+		echo "$*" >&2
+	fi
+}
+
+msg_usage() {
+	cat <<_EOF_
+Run family test.
+
+Usage:
+$PROG <options>
+
+Options:
+-h, --help		Display this help and exit
+-v, --verbose		Turn on debug
+-l, --lang=LANG		Test LANG language coverage (default: en)
+-f, --family=FILE	Set a family name supposed to be assigned for alias.
+-g, --alias=STR		Set an alias name. (default: sans-serif)
+-a, --artifactsdir=DIR	Set environment dir to store artifacts
+-k, --package=NAME	Set a package name for fonts.
+_EOF_
+}
+
+PROG="${PROG:-${0##*/}}"
+DEBUG="${DEBUG:-}"
+OPT_LANG="${OPT_LANG:-en}"
+OPT_FAMILY="${OPT_FAMILY:-}"
+OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}"
+OPT_ALIAS="${OPT_ALIAS:-sans-serif}"
+OPT_PACKAGE="${OPT_PACKAGE:-}"
+
+opt=$(getopt -n "$0" --options "hvl:f:t:a:g:k:" --longoptions "help,verbose,lang:,family:,test:,artifactsdir:,alias:,package:" -- "$@")
+eval set -- "$opt"
+while [[ $# -gt 0 ]]; do
+	case "$1" in
+	-k|--package)
+		OPT_PACKAGE="$2"
+		shift 2
+		;;
+	-g|--alias)
+		OPT_ALIAS="$2"
+		shift 2
+		;;
+	-a|--artifactsdir)
+		OPT_ARTIFACTS_DIR="$2"
+		shift 2
+		;;
+	-f|--family)
+		OPT_FAMILY="$2"
+		shift 2
+		;;
+	-l|--lang)
+		OPT_LANG="$2"
+		shift 2
+		;;
+	-v|--verbose)
+		DEBUG="-v"
+		shift
+		;;
+	-h|--help)
+		msg_usage
+		exit 0
+		;;
+	--)
+		shift
+		;;
+	*)
+		msg_usage
+		exit 1
+	esac
+done
+
+if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_FAMILY" ]; then
+	echo "Use: $PROG -h for help."
+	exit 0
+fi
+
+debug "Alias: $OPT_ALIAS"
+debug "Family: $OPT_FAMILY"
+debug "Lang: $OPT_LANG"
+debug "Artifacts dir: $OPT_ARTIFACTS_DIR"
+debug "Package name: $OPT_PACKAGE"
+STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}" | sed -e 's/\//-/g' -e 's/ /-/g')
+debug "Log file: $STR_TEST_DASHED.log"
+
+clean_exit() {
+	rc=$?;
+	trap - SIGINT SIGTERM SIGABRT EXIT
+	echo "Run test $OPT_ALIAS: 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
+	echo "$status $OPT_ALIAS" >> "$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_ALIAS}" >> "$results"
+	exit 0
+}
+trap clean_exit SIGINT SIGTERM SIGABRT EXIT
+
+cachedir=`pkg-config --variable cachedir fontconfig`
+tmpconfd=`mktemp --tmpdir -d fontsci.XXXXXXXX`
+conf=$(for i in `rpm -ql $OPT_PACKAGE | grep conf.d`; do
+	echo "<include>$i</include>"
+done)
+cat <<_EOF_> $tmpconfd/fonts.conf
+<fontconfig>
+	<dir>/usr/share/fonts</dir>
+	$conf
+	<cachedir>$cachedir</cachedir>
+</fontconfig>
+_EOF_
+debug "Config: `cat $tmpconfd/fonts.conf`"
+
+mkdir -p "$OPT_ARTIFACTS_DIR"
+export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log"
+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)
+
+debug "Check family assignment"
+res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-match -f "%{family[0]}" :family=$OPT_ALIAS:lang=$OPT_LANG`
+if [ "x$res" = "x$OPT_FAMILY" ]; then
+	echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected"
+else
+	echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)"
+fi
+rm -rf $tmpconfd

tests/roles/custom-test-fonts/files/run-lang-coverage-test

@@ -0,0 +1,155 @@
+#! /bin/bash -efu
+
+debug() {
+	if [ -n "$DEBUG" ]; then
+		echo "$*" >&2
+	fi
+}
+
+msg_usage() {
+	cat <<_EOF_
+Run language coverage test.
+
+Usage:
+$PROG <options>
+
+Options:
+-h, --help		Display this help and exit
+-v, --verbose		Turn on debug
+-l, --lang=LANG		Test LANG language coverage (default: en)
+-p, --path=PATH		Test fonts on PATH
+-a, --artifactsdir=DIR	test environment dir to store artifacts
+-i, --ignore=FILE	Ignore FILE to check.
+_EOF_
+}
+
+PROG="${PROG:-${0##*/}}"
+DEBUG="${DEBUG:-}"
+OPT_LANG="${OPT_LANG:-en}"
+OPT_PATH="${OPT_PATH:-}"
+OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}"
+OPT_IGNORE=()
+
+opt=$(getopt -n "$0" --options "hvl:p:t:a:i:" --longoptions "help,verbose,lang:,path:,test:,artifactsdir:,ignore:" -- "$@")
+eval set -- "$opt"
+while [[ $# -gt 0 ]]; do
+	case "$1" in
+	-i|--ignore)
+		OPT_IGNORE+=("$2")
+		shift 2
+		;;
+	-a|--artifactsdir)
+		OPT_ARTIFACTS_DIR="$2"
+		shift 2
+		;;
+	-p|--path)
+		OPT_PATH="$2"
+		shift 2
+		;;
+	-l|--lang)
+		OPT_LANG="$2"
+		shift 2
+		;;
+	-v|--verbose)
+		DEBUG="-v"
+		shift
+		;;
+	-h|--help)
+		msg_usage
+		exit 0
+		;;
+	--)
+		shift
+		;;
+	*)
+		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
+fi
+
+debug "Path: $OPT_PATH"
+debug "Lang: $OPT_LANG"
+debug "Artifacts dir: $OPT_ARTIFACTS_DIR"
+debug "Ignore: ${OPT_IGNORE[@]}"
+STR_TEST_DASHED=$(echo "$OPT_PATH" | sed -e 's/\//-/g')
+
+clean_exit() {
+	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
+	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
+
+mkdir -p "$OPT_ARTIFACTS_DIR"
+export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log"
+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)
+
+contains() {
+	local e match="$1"
+	shift
+	for e; do [[ "$e" == "$match" ]] && return 1; done
+	return 0
+}
+
+debug "Check language coverage"
+set +f
+for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?'`; do
+set -f
+	debug "$i"
+	if test -f $i; then
+		n=`basename $i`
+		set +e
+		contains "$n" "${OPT_IGNORE[@]}"
+		ret=$?
+		set -e
+		if [ $ret -eq 1 ]; then
+			debug "ignoring $i"
+			continue
+		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
+

tests/roles/custom-test-fonts/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - role: str-common-init

tests/roles/custom-test-fonts/tasks/main.yml

@@ -0,0 +1,39 @@
+---
+
+- block:
+  - name: language coverage
+    script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].ignore is not defined else "--ignore " + (coverage[item].ignore | join('--ignore ')) }}
+    with_items:
+    - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}"
+  - name: generic family assignment
+    script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }}
+    with_items:
+    - "{{ families }}"
+
+  - name: Check the results
+    shell: |
+      log="{{ remote_artifacts }}/test.log"
+      if [ ! -f "$log" ]; then
+          echo ERROR
+          echo "Test results not found." 1>&2
+      elif grep ^ERROR "$log" 1>&2; then
+          echo ERROR
+      elif grep ^FAIL "$log" 1>&2; then
+          echo FAIL
+      elif grep -q ^PASS "$log"; then
+          echo PASS
+      else
+          echo ERROR
+          echo "No test results found." 1>&2
+      fi
+    register: test_results
+
+  - name: Set role result
+    set_fact:
+      role_result: "{{ test_results.stdout }}"
+      role_message: "{{ test_results.stderr|d('test execution error.') }}"
+      role_result_failed: "{{ test_results.stdout != 'PASS' }}"
+      role_result_msg: "{{ test_results.stderr|d('test execution error.') }}"
+
+  - include_role:
+      name: str-common-final

tests/tests.yml

@@ -0,0 +1,21 @@
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: custom-test-fonts
+    required_packages:
+    - overpass-fonts
+    - overpass-mono-fonts
+    path_prefix: /usr/share/fonts/overpass
+    coverage:
+     - en
+    families:
+    - lang: en
+      alias: sans-serif
+      family: Overpass
+      package: overpass-fonts
+    - lang: en
+      alias: monospace
+      family: Overpass Mono
+      package: overpass-mono-fonts
+