From 0733fb0b277bcc3b22cdab62620c6e710dd14081 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Apr 28 2020 17:13:08 +0000 Subject: this package replaced by ht-caladea-fonts --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e629ffe..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/crosextrafonts-20130214.tar.gz diff --git a/30-0-google-crosextra-caladea-fontconfig.conf b/30-0-google-crosextra-caladea-fontconfig.conf deleted file mode 100644 index 96696a4..0000000 --- a/30-0-google-crosextra-caladea-fontconfig.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Cambria - - Caladea - - - - Caladea - - Cambria - - - diff --git a/62-google-crosextra-caladea-fontconfig.conf b/62-google-crosextra-caladea-fontconfig.conf deleted file mode 100644 index 8ae2f2a..0000000 --- a/62-google-crosextra-caladea-fontconfig.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - - - serif - - Caladea - - - - Caladea - - serif - - - - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..b57b8f1 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +this package replaced by ht-caladea-fonts diff --git a/google-crosextra-caladea-fonts.spec b/google-crosextra-caladea-fonts.spec deleted file mode 100644 index f2914fd..0000000 --- a/google-crosextra-caladea-fonts.spec +++ /dev/null @@ -1,104 +0,0 @@ -%global fontname google-crosextra-caladea -%global fontconf62 62-%{fontname} -%global fontconf30 30-0-%{fontname} - -%global archivename crosextrafonts-20130214 - -Name: %{fontname}-fonts -Version: 1.002 -Release: 0.14.20130214%{?dist} -Summary: Serif font metric-compatible with Cambria font - -# License added in font as "otfinfo -i Caladea-Regular.ttf | grep License" -# also from http://code.google.com/p/chromium/issues/detail?id=280557 -License: ASL 2.0 -URL: http://code.google.com/p/chromium/issues/detail?id=168879 -Source0: http://gsdview.appspot.com/chromeos-localmirror/distfiles/%{archivename}.tar.gz -Source1: 30-0-%{fontname}-fontconfig.conf -Source2: 62-%{fontname}-fontconfig.conf -Source3: %{fontname}.metainfo.xml - -BuildArch: noarch -BuildRequires: fontpackages-devel -Requires: fontpackages-filesystem - -%description -Caladea is metric-compatible with Cambria font. This font is a serif -typeface family based on Lato. - -%prep -%setup -q -n %{archivename} - - -%build - - -%install -install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p *.ttf %{buildroot}%{_fontdir} - -install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ - %{buildroot}%{_fontconfig_confdir} - -install -m 0644 -p %{SOURCE1} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-fontconfig.conf -install -m 0644 -p %{SOURCE2} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-fontconfig.conf - -ln -s %{_fontconfig_templatedir}/%{fontconf30}-fontconfig.conf \ - %{buildroot}%{_fontconfig_confdir}/%{fontconf30}-fontconfig.conf -ln -s %{_fontconfig_templatedir}/%{fontconf62}-fontconfig.conf \ - %{buildroot}%{_fontconfig_confdir}/%{fontconf62}-fontconfig.conf - -# Add AppStream metadata -install -Dm 0644 -p %{SOURCE3} \ - %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml - -%_font_pkg -f *-%{fontname}-fontconfig.conf *.ttf -%doc -%{_datadir}/appdata/%{fontname}.metainfo.xml - - -%changelog -* Wed Jan 29 2020 Fedora Release Engineering - 1.002-0.14.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.002-0.13.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.002-0.12.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.002-0.11.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.002-0.10.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.002-0.9.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.002-0.8.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 1.002-0.7.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.002-0.6.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Oct 16 2014 Parag Nemade - 1.002-0.5.20130214 -- Add metainfo file to show this font in gnome-software - -* Sat Jun 07 2014 Fedora Release Engineering - 1.002-0.4.20130214 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Jan 22 2014 Parag Nemade - 1.002-0.3.20130214 -- Resolves:rh#1056029 - Fontconfig and summary required fixes - -* Tue Oct 15 2013 Parag Nemade - 1.002-0.2.20130214 -- Added license information in comments - -* Thu Oct 10 2013 Parag Nemade - 1.002-0.1.20130214 -- Initial Fedora release. - diff --git a/google-crosextra-caladea.metainfo.xml b/google-crosextra-caladea.metainfo.xml deleted file mode 100644 index 97d4239..0000000 --- a/google-crosextra-caladea.metainfo.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - google-crosextra-caladea - CC-BY-3.0 - Caladea - Serif font metric-compatible with Cambria font - -

- Caladea is metric-compatible with Cambria font. This font is a serif - typeface family based on Lato. -

- - pnemade_at_redhat_dot_com - http://code.google.com/p/chromium/issues/detail?id=168879 - - diff --git a/sources b/sources deleted file mode 100644 index 0b113a8..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -368f114c078f94214a308a74c7e991bc crosextrafonts-20130214.tar.gz diff --git a/tests/roles/custom-test-fonts/defaults/main.yml b/tests/roles/custom-test-fonts/defaults/main.yml deleted file mode 100644 index fe09145..0000000 --- a/tests/roles/custom-test-fonts/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -role_pkgs_req: - - fontconfig - - fontconfig-devel - - pkg-config - - rsync diff --git a/tests/roles/custom-test-fonts/files/run-family-test b/tests/roles/custom-test-fonts/files/run-family-test deleted file mode 100755 index e87cad0..0000000 --- a/tests/roles/custom-test-fonts/files/run-family-test +++ /dev/null @@ -1,153 +0,0 @@ -#! /bin/bash -efu - -debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi -} - -msg_usage() { - cat <<_EOF_ -Run family test. - -Usage: -$PROG - -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 "$i" -done) -cat <<_EOF_> $tmpconfd/fonts.conf - - /usr/share/fonts - $conf - $cachedir - -_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 diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test deleted file mode 100755 index 81fefa8..0000000 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ /dev/null @@ -1,197 +0,0 @@ -#! /bin/bash -efu - -debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi -} - -msg_usage() { - cat <<_EOF_ -Run language coverage test. - -Usage: -$PROG - -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 --n, --name=NAME Set NAME to store a log file. --a, --artifactsdir=DIR test environment dir to store artifacts --e, --exclude=FILE Exclude FILE to check. --i, --include=FILE Include 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_EXCLUDE=() -OPT_INCLUDE=() -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 - -n|--name) - OPT_NAME="$2" - shift 2 - ;; - -i|--include) - OPT_INCLUDE+=("$2") - shift 2 - ;; - -e|--exclude) - OPT_EXCLUDE+=("$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 - -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_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.*\)?\(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 - 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 - fi -done - diff --git a/tests/roles/custom-test-fonts/meta/main.yml b/tests/roles/custom-test-fonts/meta/main.yml deleted file mode 100644 index f6d273c..0000000 --- a/tests/roles/custom-test-fonts/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -dependencies: - - role: str-common-init diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml deleted file mode 100644 index 981d3aa..0000000 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- - -- 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 "')) + '"'}} - with_items: - - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - - name: generic family assignment - when: families is defined - 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 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d2a15e0..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: localhost - tags: - - classic - roles: - - role: custom-test-fonts - required_packages: - - google-crosextra-caladea-fonts - path_prefix: /usr/share/fonts/google-crosextra-caladea - package: google-crosextra-caladea-fonts - coverage: - - en - families: - - lang: en - alias: serif - family: Caladea