SOURCES/urw-base35-fonts-20200910-Nimbus-Mono-substitution.patch

@@ -1,26 +0,0 @@
---- 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>
-

SOURCES/urw-base35-fonts-20200910-add-alias-to-Century.patch

@@ -1,31 +0,0 @@
-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
-

SOURCES/urw-base35-fonts-20200910-dont-config-d050000l-as-fantasy-font.patch

@@ -1,24 +0,0 @@
---- 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">

SPECS/urw-base35-fonts.spec

@@ -178,17 +178,20 @@ 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 \
 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:          20200910
-Release:          20%{?dist}
+Release:          6%{?dist}
 
 # NOTE: (URW)++ holds the copyright, but Artifex Software has obtained rights to
 #       release these fonts under GNU Affero General Public License (version 3).
-#       Also contains subpackage legacy with older version of the fonts (with GPLv2.0+ license) still needed by a few applications.
+License:          AGPLv3
-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
@@ -196,10 +199,6 @@ 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
 
@@ -239,7 +238,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-//')      \
@@ -248,8 +247,13 @@ 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):   coreutils                                                    \
+Requires(post):   fontconfig                                                   \
+Requires(postun): fontconfig                                                   \
                                                                                \
+# 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:                                                                          \
@@ -327,7 +331,7 @@ required by some of the software, 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
+%fontfamily_subpkg Nimbus Sans -c -o nimbus-sans-narrow
 %fontfamily_subpkg P052
 %fontfamily_subpkg Standard Symbols PS -c
 %fontfamily_subpkg URW Bookman -c
@@ -451,54 +455,12 @@ mkfontdir   %{legacydir}
 # =============================================================================
 
 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 20200910-20
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 20200910-6
-- Bump release for June 2024 mass rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-
+  Related: rhbz#1991688
-* 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
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20200910-5
-- Remove definition of D050000L font as fantasy in D050000L.conf file (#1909382)
+- 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)