Compare commits

...

No commits in common. "c9s" and "c8s" have entirely different histories.
c9s ... c8s

5 changed files with 28 additions and 59 deletions

2
.gitignore vendored
View File

@ -1,4 +1,2 @@
/urw-base35-20160926.zip
/urw-base35-fonts-20170801.tar.gz
/urw-fonts-1.0.7pre44.tar.bz2
/urw-base35-fonts-20200910.tar.gz

View File

@ -1,3 +0,0 @@
# 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.

View File

@ -1,8 +0,0 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}

View File

@ -1,2 +1,2 @@
SHA512 (urw-base35-fonts-20200910.tar.gz) = 71fb27baadf5abc4ff624cdede02038681acd5fffdc728a5b2e7808713b80cb2f2174f90a1862e69d390c4434c49d5167ab095100032fa3ba80b586eb8ae51d1
SHA512 (urw-base35-fonts-20170801.tar.gz) = a34d85d75db88ff0862d65cb3dc163f297fc26cdc4df1dc36ce9328e5bebd43e67c41db8095685627aceca8467aa4ccbe631e3baa08729c9f5e7cf9f2923ed27
SHA512 (urw-fonts-1.0.7pre44.tar.bz2) = ffcd58c7efc8e2a3d09d11282216a1c7917d13d5230548526b010ce3342c629a2c12bc825fb8fc1ec2bb39ae8144cc5c3da8ef5dd6462aa294236036f3bca347

View File

@ -155,17 +155,25 @@
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} \
@ -175,7 +183,7 @@
%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. These fonts are provided freely \
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.
# Necessary after removal of *-nimbus-sans-narrow subpackage.
@ -186,8 +194,8 @@ by (URW)++ company, and are mainly utilized by applications using Ghostscript.
Name: %{fontname}-fonts
Summary: Core Font Set containing 35 freely distributable fonts from (URW)++
Version: 20200910
Release: 6%{?dist}
Version: 20170801
Release: 10%{?dist}
# NOTE: (URW)++ holds the copyright, but Artifex Software has obtained rights to
# release these fonts under GNU Affero General Public License (version 3).
@ -225,6 +233,10 @@ 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}
@ -248,7 +260,12 @@ 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(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: \
@ -305,7 +322,7 @@ Requires: %{name} = %{version}-%{release}
%description devel
%{common_desc}
This package is useful for development purposes only. It installs RPM
This package is useful for Fedora development purposes only. It installs RPM
macros useful for building packages against %{name},
as well as all the fonts contained in this font set.
@ -313,14 +330,12 @@ 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, like e.g. xfig, X11, etc.
required by some of the software in Fedora, like e.g. xfig, X11, etc.
# =============================================================================
# NOTE: When making an update, make sure to check if any font families were
@ -409,10 +424,14 @@ 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
@ -434,7 +453,7 @@ mkfontdir %{legacydir}
%{_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}
# ---------------
@ -455,43 +474,6 @@ mkfontdir %{legacydir}
# =============================================================================
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 20200910-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20200910-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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)