.jomolhari-fonts.metadata

@@ -1 +0,0 @@
-90d3d27b041029ccfc290d02f0047dd432aa6ace jomolhari-alpha003c.zip

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}

jomolhari-fonts-fontconfig.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>
@@ -66,7 +66,7 @@
         </match>
 
 	<match target="font">
-	  <test name="family" ignore-blanks="true">
+	  <test name="family" ignore-blanks="yes">
 	    <string>Jomolhari</string>
 	  </test>
 	  <edit name="autohint" mode="assign">

jomolhari-fonts.spec

@@ -1,77 +1,65 @@
+%global	fontname jomolhari
+%global fontconf 65-0-%{fontname}.conf
+
+Name:		%{fontname}-fonts
 Version:	0.003
-Release:        34%{?dist}
-# Try following URL for this package
-#URL:           https://sites.google.com/site/chrisfynn2/home/fonts/jomolhari
+Release:	25%{?dist}
+Summary:	Jomolhari a Bhutanese style font for Tibetan and Dzongkha
+
+License:	OFL
 # Looks like currently following URL is gone now. Maybe temporary issue
 #URL:		http://chris.fynn.googlepages.com/jomolhari
+# Try following URL for this package
+#URL:           https://sites.google.com/site/chrisfynn2/home/fonts/jomolhari
+Source0:	http://chris.fynn.googlepages.com/jomolhari-alpha003c.zip
+Source1:        %{name}-fontconfig.conf 
+Source2:        %{fontname}.metainfo.xml
 
-%global fontlicense       OFL
-%global fontlicenses      OFL.txt
-%global fontdocs          *.txt
-%global fontdocsex        %{fontlicenses}
+BuildArch:	noarch
+BuildRequires:	fontpackages-devel
+Requires:	fontpackages-filesystem
 
-%global fontfamily        Jomolhari
-%global fontsummary       Jomolhari a Bhutanese style font for Tibetan and Dzongkha
-%global archivename       jomolhari-alpha003c
-%global fonts             *.ttf
-%global fontconfs         %{SOURCE1}
-%global fontdescription   %{expand:
+%description
 Jomolhari is an TrueType OpenType Bhutanese style font for Dzongkha and
 Tibetan text. It is based on Bhutanese manuscript examples, supports the
 Unicode and the Chinese encoding for Tibetan.
-The font supports the standard combinations used in most texts.}
-
-Source0: http://chris.fynn.googlepages.com/%{archivename}.zip
-Source1:        65-0-%{fontpkgname}.conf 
-
-%fontpkg
+The font supports the standard combinations used in most texts.
 
 %prep
 %setup -q -c
-%linuxtext FONTLOG.txt OFL-FAQ.txt OFL.txt
 
 %build
-%fontbuild
+# Empty build section
 
 %install
-%fontinstall
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
-%check
-%fontcheck
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-%fontfiles
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
+for i in FONTLOG.txt OFL-FAQ.txt OFL.txt
+do
+	tr -d '\r' < $i > ${i}.tmp
+	mv -f ${i}.tmp $i
+done
+
+# Add AppStream metadata
+install -Dm 0644 -p %{SOURCE2} \
+        %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
+
+%_font_pkg -f 65-0-%{fontname}.conf *.ttf
+%doc FONTLOG.txt OFL-FAQ.txt OFL.txt
+%{_datadir}/appdata/%{fontname}.metainfo.xml
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com>
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun May 24 2020 Parag Nemade <pnemade AT redhat DOT com> - 0.003-30
-- Update fontconfig DTD id in conf file
-
-* Fri Mar 13 2020 Parag Nemade <pnemade AT redhat DOT com> - 0.003-29
-- Convert to new fonts packaging guidelines
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Mon Nov 18 2019 Parag Nemade <pnemade AT redhat DOT com> - 0.003-25
+- Resolves:rh#1682166 - Added CI tests
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

jomolhari.metainfo.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
+<component type="font">
+  <id>jomolhari</id>
+  <metadata_license>CC-BY-3.0</metadata_license>
+  <name>Jomolhari</name>
+  <summary>Jomolhari a Bhutanese style font for Tibetan and Dzongkha</summary>
+  <description>
+    <p>
+      Jomolhari is an TrueType OpenType Bhutanese style font for Dzongkha and
+      Tibetan text. It is based on Bhutanese manuscript examples, supports the
+      Unicode and the Chinese encoding for Tibetan.
+      The font supports the standard combinations used in most texts.
+    </p>
+  </description>
+  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
+  <url type="homepage">https://sites.google.com/site/chrisfynn2/home/fonts/jomolhari</url>
+</component>
+

sources

@@ -1 +1 @@
-0d03b98a7184a966815b85e7556e8bcb  jomolhari-alpha003c.zip
+SHA512 (jomolhari-alpha003c.zip) = d3dd179c84c5cfb5cdc4a82ea1356b594973ef056cbc8fa4e23e37f21573b138eded19ef7370803dbe796e80a0d2c72a0866eb9f36e4b511627c770a00e08270

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

@@ -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=()
@@ -55,7 +55,7 @@ while [[ $# -gt 0 ]]; do
 	    shift 2
 	    ;;
 	-p|--path)
-		OPT_PATH="$2"
+	    OPT_PATH+=("$2")
 	    shift 2
 	    ;;
 	-l|--lang)
@@ -84,36 +84,12 @@ if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then
     exit 0
 fi
 
-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')
+STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g')
 
 clean_exit() {
     rc=$?;
     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
 	if [ -n "$(ps -p $pid -o pid=)" ]; then
 	    kill -s HUP $pid
@@ -130,6 +106,8 @@ clean_exit() {
 	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
@@ -137,12 +115,12 @@ clean_exit() {
     else
 	status="ERROR"
     fi
-	echo "$status $OPT_PATH" >> "$OPT_ARTIFACTS_DIR/test.log"
+    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_PATH}" >> "$results"
+    echo "- {result: $result, test: $OPT_LANG}" >> "$results"
     exit 0
 }
 trap clean_exit SIGINT SIGTERM SIGABRT EXIT
@@ -153,6 +131,53 @@ 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
@@ -162,7 +187,8 @@ contains() {
 
 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
+    for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do
 	set -f
 	debug "$i"
 	if test -f $i; then
@@ -184,6 +210,7 @@ set -f
 		    debug "$i isn't targeted file"
 		    continue
 		fi
+		NOT_MATCHED=("${NOT_MATCHED[@]/$n}")
 	    fi
 	    debug "  $i"
 	    res=`fc-validate -l $OPT_LANG $i`
@@ -194,4 +221,4 @@ set -f
 	    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:
     - jomolhari-fonts
-    path_prefix: /usr/share/fonts/jomolhari-fonts
+    path_prefix: /usr/share/fonts/jomolhari
     package: jomolhari-fonts
     coverage:
      - bo