Compare commits
No commits in common. "c8s" and "c10s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,4 @@
|
||||
/urw-base35-20160926.zip
|
||||
/urw-base35-fonts-20170801.tar.gz
|
||||
/urw-fonts-1.0.7pre44.tar.bz2
|
||||
/urw-base35-fonts-20200910.tar.gz
|
||||
|
||||
3
README.md
Normal file
3
README.md
Normal file
@ -0,0 +1,3 @@
|
||||
# urw-base35-fonts
|
||||
|
||||
The Level 2 Core Font Set is a PostScript specification of 35 base fonts that can be used with any PostScript file. In Fedora, these fonts are provided freely by (URW)++ company, and are mainly utilized by applications using Ghostscript.
|
||||
25
gating.yaml
Normal file
25
gating.yaml
Normal file
@ -0,0 +1,25 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_testing
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||
|
||||
#Rawhide
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||
|
||||
#gating rhel
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-*
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
|
||||
36
plans.fmf
Normal file
36
plans.fmf
Normal file
@ -0,0 +1,36 @@
|
||||
/tier1-internal:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/urw-base35-fonts.git
|
||||
name: /plans/tier1/internal
|
||||
|
||||
/tier1-public:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/urw-base35-fonts.git
|
||||
name: /plans/tier1/public
|
||||
|
||||
/tier2-tier3-internal:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/urw-base35-fonts.git
|
||||
name: /plans/tier2-tier3/internal
|
||||
|
||||
/tier2-tier3-public:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/urw-base35-fonts.git
|
||||
name: /plans/tier2-tier3/public
|
||||
|
||||
/others-internal:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/urw-base35-fonts.git
|
||||
name: /plans/others/internal
|
||||
|
||||
/others-public:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/urw-base35-fonts.git
|
||||
name: /plans/others/public
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (urw-base35-fonts-20170801.tar.gz) = a34d85d75db88ff0862d65cb3dc163f297fc26cdc4df1dc36ce9328e5bebd43e67c41db8095685627aceca8467aa4ccbe631e3baa08729c9f5e7cf9f2923ed27
|
||||
SHA512 (urw-base35-fonts-20200910.tar.gz) = 71fb27baadf5abc4ff624cdede02038681acd5fffdc728a5b2e7808713b80cb2f2174f90a1862e69d390c4434c49d5167ab095100032fa3ba80b586eb8ae51d1
|
||||
SHA512 (urw-fonts-1.0.7pre44.tar.bz2) = ffcd58c7efc8e2a3d09d11282216a1c7917d13d5230548526b010ce3342c629a2c12bc825fb8fc1ec2bb39ae8144cc5c3da8ef5dd6462aa294236036f3bca347
|
||||
|
||||
26
urw-base35-fonts-20200910-Nimbus-Mono-substitution.patch
Normal file
26
urw-base35-fonts-20200910-Nimbus-Mono-substitution.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- a/fontconfig/urw-nimbus-mono-ps.conf
|
||||
+++ b/fontconfig/urw-nimbus-mono-ps.conf
|
||||
@@ -1,6 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
<fontconfig>
|
||||
+<!-- Substitution with DejaVu Sans Mono. Nimbus Mono PS is not properly monospaced. -->
|
||||
++<match>
|
||||
++ <test name="family"><string>Nimbus Mono PS</string></test>
|
||||
++ <edit name="family"><string>DejaVu Sans Mono</string></edit>
|
||||
++</match>
|
||||
+
|
||||
++<match>
|
||||
++ <test name="family"><string>Courier</string></test>
|
||||
++ <edit name="family"><string>DejaVu Sans Mono</string></edit>
|
||||
++</match>
|
||||
+
|
||||
++<match>
|
||||
++ <test name="family"><string>Nimbus Mono L</string></test>
|
||||
++ <edit name="family"><string>DejaVu Sans Mono</string></edit>
|
||||
++</match>
|
||||
+
|
||||
<!-- Generic name aliasing -->
|
||||
<alias>
|
||||
<family>monospace</family>
|
||||
|
||||
31
urw-base35-fonts-20200910-add-alias-to-Century.patch
Normal file
31
urw-base35-fonts-20200910-add-alias-to-Century.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From ae671b1b1f4219b090628f259b994eada336d965 Mon Sep 17 00:00:00 2001
|
||||
From: John Pye <john.pye@anu.edu.au>
|
||||
Date: Wed, 3 Nov 2021 09:07:03 +1100
|
||||
Subject: [PATCH] adding an alias to 'Century'
|
||||
|
||||
(see https://docs.microsoft.com/en-us/typography/font-list/century)
|
||||
---
|
||||
fontconfig/urw-c059.conf | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/fontconfig/urw-c059.conf b/fontconfig/urw-c059.conf
|
||||
index 8d3126e..35b3a24 100644
|
||||
--- a/fontconfig/urw-c059.conf
|
||||
+++ b/fontconfig/urw-c059.conf
|
||||
@@ -40,6 +40,13 @@
|
||||
</accept>
|
||||
</alias>
|
||||
|
||||
+ <alias binding="same">
|
||||
+ <family>Century</family>
|
||||
+ <accept>
|
||||
+ <family>C059</family>
|
||||
+ </accept>
|
||||
+ </alias>
|
||||
+
|
||||
<alias binding="same">
|
||||
<family>Tex Gyre Schola</family>
|
||||
<accept>
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
--- urw-base35-fonts-20200910/fontconfig/urw-d050000l.conf 2021-06-08 08:40:17.408120093 +0200
|
||||
+++ urw-base35-fonts-20200910/fontconfig/urw-d050000l.conf 2021-06-08 08:40:32.902248846 +0200
|
||||
@@ -1,21 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
<fontconfig>
|
||||
- <!-- Generic name aliasing -->
|
||||
- <alias>
|
||||
- <family>fantasy</family>
|
||||
- <prefer>
|
||||
- <family>D050000L</family>
|
||||
- </prefer>
|
||||
- </alias>
|
||||
-
|
||||
- <!-- Generic name assignment -->
|
||||
- <alias>
|
||||
- <family>D050000L</family>
|
||||
- <default>
|
||||
- <family>fantasy</family>
|
||||
- </default>
|
||||
- </alias>
|
||||
|
||||
<!-- Original PostScript base font mapping -->
|
||||
<alias binding="same">
|
||||
@ -155,25 +155,17 @@
|
||||
if [[ $1 -eq 0 ]]; then \
|
||||
# mkfontscale %{_fontdir} &> /dev/null || : \
|
||||
# mkfontdir %{_fontdir} &> /dev/null || : \
|
||||
# xset fp rehash &> /dev/null || : \
|
||||
true || : \
|
||||
fi \
|
||||
)
|
||||
|
||||
|
||||
# The content of this scriptlet is only run once during install/update.
|
||||
#
|
||||
# NOTE: 'xset' is an utility requiring X server to be running. Because of it,
|
||||
# the 'xset fp rehash' will fail to udpate its font database, when the
|
||||
# X server is stopped. This has been already reported (and closed):
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1466254
|
||||
%global posttrans_scriptlet() \
|
||||
( \
|
||||
if [[ -x %{tmpfile} ]]; then \
|
||||
# mkfontscale %{_fontdir} \
|
||||
# mkfontdir %{_fontdir} \
|
||||
# export DISPLAY=:0 \
|
||||
# xset fp rehash &> /dev/null || : \
|
||||
# \
|
||||
true || : \
|
||||
rm -rf %{tmpdir} \
|
||||
@ -183,23 +175,20 @@
|
||||
|
||||
%global common_desc \
|
||||
The Level 2 Core Font Set is a PostScript specification of 35 base fonts that \
|
||||
can be used with any PostScript file. In Fedora, these fonts are provided freely \
|
||||
can be used with any PostScript file. These fonts are provided freely \
|
||||
by (URW)++ company, and are mainly utilized by applications using Ghostscript.
|
||||
|
||||
# Necessary after removal of *-nimbus-sans-narrow subpackage.
|
||||
# Remove this once F27 is EOL.
|
||||
%global obsolete_vers 20170801-4
|
||||
|
||||
# =============================================================================
|
||||
|
||||
Name: %{fontname}-fonts
|
||||
Summary: Core Font Set containing 35 freely distributable fonts from (URW)++
|
||||
Version: 20170801
|
||||
Release: 10%{?dist}
|
||||
Version: 20200910
|
||||
Release: 21%{?dist}
|
||||
|
||||
# NOTE: (URW)++ holds the copyright, but Artifex Software has obtained rights to
|
||||
# release these fonts under GNU Affero General Public License (version 3).
|
||||
License: AGPLv3
|
||||
# Also contains subpackage legacy with older version of the fonts (with GPLv2.0+ license) still needed by a few applications.
|
||||
License: AGPL-3.0-only AND GPL-2.0-or-later
|
||||
|
||||
URL: https://www.urwpp.de/en/
|
||||
Source: https://github.com/ArtifexSoftware/urw-base35-fonts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
@ -207,6 +196,10 @@ Source1: urw-fonts-1.0.7pre44.tar.bz2
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Patch01: urw-base35-fonts-20200910-dont-config-d050000l-as-fantasy-font.patch
|
||||
Patch02: urw-base35-fonts-20200910-Nimbus-Mono-substitution.patch
|
||||
Patch03: urw-base35-fonts-20200910-add-alias-to-Century.patch
|
||||
|
||||
BuildRequires: fontpackages-devel
|
||||
BuildRequires: libappstream-glib
|
||||
|
||||
@ -233,10 +226,6 @@ Requires: %{fontname}-z003-fonts
|
||||
|
||||
# Upstream patches -- official upstream patches released by upstream since the
|
||||
# ---------------- last rebase that are necessary for any reason:
|
||||
Patch000: urw-base35-fonts-20170801-000-split-urw-fallback.patch
|
||||
Patch001: urw-base35-fonts-20170801-001-appstream-typos-and-syntax-fix.patch
|
||||
Patch002: urw-base35-fonts-20170801-002-BdOblique-renamed.patch
|
||||
Patch003: urw-base35-fonts-20170801-003-merge-Nimbus-Sans-Narrow.patch
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
@ -250,7 +239,7 @@ This meta-package will install all the 35 fonts from the %{name}.
|
||||
# USAGE: font_subpkg [-c] [-o old_subpackage_name]
|
||||
# -c Make this subpackage conflict with the previous versions of URW fonts.
|
||||
# -o Marks this supbackage to obsolete (& provide) other previous subpackage.
|
||||
%define fontfamily_subpkg(co:) \
|
||||
%define fontfamily_subpkg(co:) \
|
||||
\
|
||||
%define ff_filename %(echo %{*} | tr --delete " ") \
|
||||
%define subpkg_name %(echo %{*} | tr "A-Z " "a-z-" | sed -e 's/urw-//') \
|
||||
@ -259,18 +248,8 @@ This meta-package will install all the 35 fonts from the %{name}.
|
||||
Summary: %{*} font family [part of Level 2 Core Font Set] \
|
||||
Requires: %{name}-common = %{version}-%{release} \
|
||||
\
|
||||
Requires(post): fontconfig \
|
||||
Requires(post): xorg-x11-font-utils \
|
||||
Requires(post): xorg-x11-server-utils \
|
||||
Requires(post): coreutils \
|
||||
\
|
||||
Requires(postun): fontconfig \
|
||||
Requires(postun): xorg-x11-font-utils \
|
||||
Requires(postun): xorg-x11-server-utils \
|
||||
\
|
||||
# NOTE: Remove the -o section below once F27 is EOL. \
|
||||
%{-o: \
|
||||
Obsoletes: %{fontname}-%{-o*}-fonts < %{obsolete_vers} \
|
||||
Provides: %{fontname}-%{-o*}-fonts < %{obsolete_vers} } \
|
||||
\
|
||||
# The section below will be only added if the '-c' option was specified: \
|
||||
%{-c: \
|
||||
@ -322,7 +301,7 @@ Requires: %{name} = %{version}-%{release}
|
||||
%description devel
|
||||
%{common_desc}
|
||||
|
||||
This package is useful for Fedora development purposes only. It installs RPM
|
||||
This package is useful for development purposes only. It installs RPM
|
||||
macros useful for building packages against %{name},
|
||||
as well as all the fonts contained in this font set.
|
||||
|
||||
@ -330,12 +309,14 @@ as well as all the fonts contained in this font set.
|
||||
|
||||
%package legacy
|
||||
Summary: Legacy version of (URW)++ Level 2 Core Font Set
|
||||
Requires(post): mkfontscale mkfontdir
|
||||
Requires(postun): mkfontscale mkfontdir
|
||||
|
||||
%description legacy
|
||||
%{common_desc}
|
||||
|
||||
This package provides previous (legacy) versions of these fonts, which are still
|
||||
required by some of the software in Fedora, like e.g. xfig, X11, etc.
|
||||
required by some of the software, like e.g. xfig, X11, etc.
|
||||
|
||||
# =============================================================================
|
||||
# NOTE: When making an update, make sure to check if any font families were
|
||||
@ -346,7 +327,7 @@ required by some of the software in Fedora, like e.g. xfig, X11, etc.
|
||||
%fontfamily_subpkg D050000L
|
||||
%fontfamily_subpkg Nimbus Mono PS -c
|
||||
%fontfamily_subpkg Nimbus Roman -c
|
||||
%fontfamily_subpkg Nimbus Sans -c -o nimbus-sans-narrow
|
||||
%fontfamily_subpkg Nimbus Sans -c
|
||||
%fontfamily_subpkg P052
|
||||
%fontfamily_subpkg Standard Symbols PS -c
|
||||
%fontfamily_subpkg URW Bookman -c
|
||||
@ -424,14 +405,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.metainfo
|
||||
%post legacy
|
||||
mkfontscale %{legacydir}
|
||||
mkfontdir %{legacydir}
|
||||
export DISPLAY=:0
|
||||
xset fp rehash &> /dev/null || :
|
||||
|
||||
%postun legacy
|
||||
mkfontscale %{legacydir}
|
||||
mkfontdir %{legacydir}
|
||||
export DISPLAY=:0
|
||||
xset fp rehash &> /dev/null || :
|
||||
|
||||
# NOTE: There's no reason to run 'post' and 'postun' scriptlets for the main
|
||||
# metapackage or the *-common subpackage. Everything necessary is handled
|
||||
@ -453,7 +430,7 @@ xset fp rehash &> /dev/null || :
|
||||
|
||||
%{_datadir}/fontconfig/conf.avail/%{fontconfig_prio}-urw-fallback-backwards.conf
|
||||
%{_sysconfdir}/fonts/conf.d/%{fontconfig_prio}-urw-fallback-backwards.conf
|
||||
#%{_sysconfdir}/X11/fontpath.d/%{name}
|
||||
#%%{_sysconfdir}/X11/fontpath.d/%%{name}
|
||||
|
||||
# ---------------
|
||||
|
||||
@ -474,6 +451,89 @@ xset fp rehash &> /dev/null || :
|
||||
# =============================================================================
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 20200910-21
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 20200910-20
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20200910-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20200910-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Feb 16 2023 Richard Lescak <rlescak@redhat.com> - 20200910-17
|
||||
- SPDX migration
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20200910-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20200910-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jun 24 2022 Adam Williamson <awilliam@redhat.com> - 20200910-14
|
||||
- Require coreutils instead of fontconfig
|
||||
|
||||
* Fri Jun 24 2022 Adam Williamson <awilliam@redhat.com> - 20200910-13
|
||||
- Put fontconfig requirement back to fix Rawhide compose
|
||||
|
||||
* Thu Jun 23 2022 Richard Lescak <rlescak@redhat.com> 20200910-12
|
||||
- Remove fontconfig requirement (#2093177)
|
||||
|
||||
* Wed May 18 2022 Richard Lescak <rlescak@redhat.com> 20200910-11
|
||||
- Substituted badly monospaced Nimbus Mono PS with Dejavu Sans Mono (#2021366)
|
||||
- added substitution for Century
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20200910-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Sep 07 2021 Richard Lescak <rlescak@redhat.com> 20200910-9
|
||||
- Recorrected typo in License field
|
||||
|
||||
* Tue Sep 07 2021 Richard Lescak <rlescak@redhat.com> 20200910-8
|
||||
- Corrected typo in License field
|
||||
|
||||
* Mon Sep 06 2021 Richard Lescak <rlescak@redhat.com> 20200910-7
|
||||
- Added GPL2.0+ license into tag (old legacy fonts), removed old obsoletes/provides from macro
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200910-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jun 09 2021 Richard Lescak <rlescak@redhat.com> 20200910-5
|
||||
- Remove definition of D050000L font as fantasy in D050000L.conf file (#1909382)
|
||||
|
||||
* Wed Mar 10 2021 Peter Hutterer <peter.hutterer@redhat.com> 20200910-4
|
||||
- Require mkfontscale and mkfontdir directly (#1937125)
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200910-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2021 Anna Khaitovich <akhaitov@redhat.com> - 20200910-2
|
||||
- Fix some X11-related packaging bugs (#1918947)
|
||||
|
||||
* Thu Oct 22 2020 Anna Khaitovich <akhaitov@redhat.com> - 20200910-1
|
||||
- Rebase to 20200910 version (#1877974)
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20170801-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Mar 10 2020 Zdenek Dohnal <zdohnal@redhat.com> - 20170801-15
|
||||
- do not mention specific OS in description
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20170801-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20170801-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20170801-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170801-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jun 18 2018 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 20170801-10
|
||||
- fc-cache call dropped (from scriptlets)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user