.sil-abyssinica-fonts.metadata

@@ -1 +0,0 @@
-4438c0e73dabef733a80132cd99178807cc4a073 AbyssinicaSIL1.200.zip

66-sil-abyssinica.conf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
 	<!-- Generic names -->
 	<alias>
@@ -16,7 +16,7 @@
 		</prefer>
 	</alias>
         <match target="font">
-          <test name="family" ignore-blanks="true">
+          <test name="family" ignore-blanks="yes">
              <string>Abyssinica SIL</string>
           </test>
           <edit name="autohint" mode="assign">

gating.yaml

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

sil-abyssinica-fonts.spec

@@ -1,20 +1,26 @@
+%global fontname     sil-abyssinica
+%global archive_name AbyssinicaSIL
+%global fontconf     66-%{fontname}.conf
+
+Name:           %{fontname}-fonts
 Version:        1.200
-Release:        23%{?dist}
+Release:        14%{?dist}
+Summary:        SIL Abyssinica fonts
 
-%global foundry           SIL
+License:        OFL
-%global fontlicense       OFL
+URL:            http://scripts.sil.org/AbyssinicaSIL
-%global fontlicenses      OFL.txt
+# download from http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=AbyssinicaSIL1.200.zip&filename=AbyssinicaSIL1.200.zip
-%global fontdocs          *.txt documentation/*.txt
+Source0:        %{archive_name}%{version}.zip
-%global fontdocsex        %{fontlicenses}
+Source1:        %{fontconf}
+Source2:        %{fontname}.metainfo.xml
 
-%global fontfamily        Abyssinica SIL
+BuildArch:      noarch
-%global fontsummary       SIL Abyssinica fonts
+Requires:       fontpackages-filesystem
-%global projectname       AbyssinicaSIL
+BuildRequires:  fontpackages-devel
-%global archivename       %{lua:t=string.gsub(rpm.expand("%{fontfamily}"), "[%p%s]+", ""); print(t)}%{version}
+BuildRequires:  dos2unix
-URL:                      https://software.sil.org/%{projectname}/
+
-%global fonts             *.ttf
+
-%global fontconfs         %{SOURCE1}
+%description
-%global fontdescription   %{expand:
 SIL Abyssinica is a Unicode typeface family containing glyphs for the
 Ethiopic script.
 
@@ -26,62 +32,41 @@ non-Unicode characters in the Private Use Area (see Private-use (PUA)
 characters supported by Abyssinica SIL).
 
 Abyssinica SIL is based on Ethiopic calligraphic traditions. This release is
-a regular typeface, with no bold or italic version available or planned.}
+a regular typeface, with no bold or italic version available or planned.
 
 
-# download from http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=AbyssinicaSIL1.200.zip&filename=AbyssinicaSIL1.200.zip
-Source0:        %{archivename}.zip
-Source1:        66-%{fontpkgname}.conf
-
-%fontpkg
-
 %prep
-%setup -q -n %{projectname}-%{version}
+%setup -q -n %{archive_name}-%{version}
-%linuxtext FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt documentation/DOCUMENTATION.txt
+
 
 %build
-%fontbuild
+dos2unix FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt documentation/DOCUMENTATION.txt
+
 
 %install
-%fontinstall
+#fonts
+install -d -m 0755 %{buildroot}%{_fontdir}
+install -m 0644 *.ttf %{buildroot}%{_fontdir}
 
-%check
+#fontconfig
-%fontcheck
+install -d -m 0755 %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
-%fontfiles
+# Add AppStream metadata
+install -Dm 0644 -p %{SOURCE2} \
+        %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
 
+%_font_pkg -f %{fontconf} *.ttf
+%doc FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt
+%doc documentation/*
+%{_datadir}/appdata/%{fontname}.metainfo.xml
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
+* Mon Nov 18 2019 Parag Nemade <pnemade AT redhat DOT com> - 1.200-14
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Resolves:rh#1682211 - Added CI tests
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com>
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.200-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.200-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun May 24 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.200-19
-- Update fontconfig DTD id in conf file
-
-* Thu Mar 12 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.200-18
-- Convert to new fonts packaging guidelines
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.200-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.200-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.200-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.200-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.200-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

sil-abyssinica.metainfo.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
+<component type="font">
+  <id>sil-abyssinica</id>
+  <metadata_license>CC-BY-3.0</metadata_license>
+  <name>Abyssinica SIL</name>
+  <summary>SIL Abyssinica fonts</summary>
+  <description>
+    <p>
+      SIL Abyssinica is a Unicode typeface family containing glyphs for the
+      Ethiopic script.
+    </p>
+  </description>
+  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
+  <url type="homepage">http://scripts.sil.org/AbyssinicaSIL</url>
+</component>
+

sources

@@ -1 +1 @@
-8210f0468e297009638be9cbe9fb4bda  AbyssinicaSIL1.200.zip
+SHA512 (AbyssinicaSIL1.200.zip) = 49c74476da85a38b0bccf341953198c5f5f750fbeaec724e2d50ea305d8c127b928304d7410b001997a3c91d4d5d5144c226c29873eae9e18de38cdfef7a6ada

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

@@ -1,13 +1,13 @@
 #! /bin/bash -efu
 
 debug() {
-	if [ -n "$DEBUG" ]; then
+    if [ -n "$DEBUG" ]; then
-		echo "$*" >&2
+	echo "$*" >&2
-	fi
+    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,113 +37,91 @@ 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"
+	    OPT_NAME="$2"
-		shift 2
+	    shift 2
-		;;
+	    ;;
 	-i|--include)
-		OPT_INCLUDE+=("$2")
+	    OPT_INCLUDE+=("$2")
-		shift 2
+	    shift 2
-		;;
+	    ;;
 	-e|--exclude)
-		OPT_EXCLUDE+=("$2")
+	    OPT_EXCLUDE+=("$2")
-		shift 2
+	    shift 2
-		;;
+	    ;;
 	-a|--artifactsdir)
-		OPT_ARTIFACTS_DIR="$2"
+	    OPT_ARTIFACTS_DIR="$2"
-		shift 2
+	    shift 2
-		;;
+	    ;;
 	-p|--path)
-		OPT_PATH="$2"
+	    OPT_PATH+=("$2")
-		shift 2
+	    shift 2
-		;;
+	    ;;
 	-l|--lang)
-		OPT_LANG="$2"
+	    OPT_LANG="$2"
-		shift 2
+	    shift 2
-		;;
+	    ;;
 	-v|--verbose)
-		DEBUG="-v"
+	    DEBUG="-v"
-		shift
+	    shift
-		;;
+	    ;;
 	-h|--help)
-		msg_usage
+	    msg_usage
-		exit 0
+	    exit 0
-		;;
+	    ;;
 	--)
-		shift
+	    shift
-		;;
+	    ;;
 	*)
-		msg_usage
+	    msg_usage
-		exit 1
+	    exit 1
-	esac
+    esac
 done
 
 if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then
-	echo "Use: $PROG -h for help."
+    echo "Use: $PROG -h for help."
-	exit 0
+    exit 0
 fi
 
-expand_regex() {
+STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g')
-	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=$?;
+    rc=$?;
-	trap - SIGINT SIGTERM SIGABRT EXIT
+    trap - SIGINT SIGTERM SIGABRT EXIT
-	echo "Run test $OPT_PATH: done."
+    echo "Run test $OPT_LANG: done."
-	for pid in $(ps -o pid --no-headers --ppid $$); do
+    for pid in $(ps -o pid --no-headers --ppid $$); do
-		if [ -n "$(ps -p $pid -o pid=)" ]; then
+	if [ -n "$(ps -p $pid -o pid=)" ]; then
-			kill -s HUP $pid
+	    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"
+    done
-	mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}"
+    local log_file_name="$STR_TEST_DASHED.log"
-	local results="$OPT_ARTIFACTS_DIR/results.yml"
+    local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name"
-	local result=$(echo $status | tr '[:upper:]' '[:lower:]')
+    local status
-	test -f "$results" || echo 'results:' > "$results"
+    if [[ $rc -eq 127 ]]; then
-	echo "- {result: $result, test: $OPT_PATH}" >> "$results"
+	status="ERROR"
-	exit 0
+    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
 }
 trap clean_exit SIGINT SIGTERM SIGABRT EXIT
 
@@ -153,45 +131,94 @@ 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"
+    local e match="$1"
-	shift
+    shift
-	for e; do [[ "$e" == "$match" ]] && return 1; done
+    for e; do [[ "$e" == "$match" ]] && return 1; done
-	return 0
+    return 0
 }
 
 debug "Check language coverage"
 set +f
-for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do
+for p in ${OPT_PATH[@]}; do
-set -f
+    for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do
+	set -f
 	debug "$i"
 	if test -f $i; then
-		n=`basename $i`
+	    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
 		set +e
-		contains "$n" "${OPT_EXCLUDE[@]}"
+		contains "$n" "${OPT_INCLUDE[@]}"
 		ret=$?
 		set -e
-		if [ $ret -eq 1 ]; then
+		if [ $ret -eq 0 ]; then
-			debug "ignoring $i"
+		    debug "$i isn't targeted file"
-			continue
+		    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
-

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

@@ -2,7 +2,7 @@
 
 - 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].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 }}" {% 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 "')) + '"'}}
     with_items:
     - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}"
   - name: generic family assignment

tests/tests.yml

@@ -5,7 +5,7 @@
   - role: custom-test-fonts
     required_packages:
     - sil-abyssinica-fonts
-    path_prefix: /usr/share/fonts/sil-abyssinica-fonts
+    path_prefix: /usr/share/fonts/sil-abyssinica
     package: sil-abyssinica-fonts
     coverage:
      - en