7 changed files with 47 additions and 1659 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/urw-base35-fonts-20170801.tar.gz
+SOURCES/urw-base35-fonts-20200910.tar.gz
 SOURCES/urw-fonts-1.0.7pre44.tar.bz2
--- a/.urw-base35-fonts.metadata
+++ b/.urw-base35-fonts.metadata
@ -1,2 +1,2 @@
-c9d8c9707416ae24dcce8fddf73a2517bf42731e SOURCES/urw-base35-fonts-20170801.tar.gz
+57759a9089026927156907f59888c6c5ce493ef8 SOURCES/urw-base35-fonts-20200910.tar.gz
 465fd5faab9ba9e7590f1bf761015862eb09748d SOURCES/urw-fonts-1.0.7pre44.tar.bz2
--- a/SOURCES/urw-base35-fonts-20170801-000-split-urw-fallback.patch
+++ b/SOURCES/urw-base35-fonts-20170801-000-split-urw-fallback.patch
@ -1,755 +0,0 @@
 From 70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9 Mon Sep 17 00:00:00 2001
 From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
 Date: Mon, 25 Sep 2017 14:50:09 +0200
 Subject: [PATCH] fontconfig: split urw-fallback.conf into 3 files
  According to fontconfig upstream, this provides a better granularity,
  so some distributions do not have to ship all of these mappings.
 ---
 fontconfig/urw-fallback-backwards.conf | 136 ++++++++++++++
 fontconfig/urw-fallback-generics.conf  | 104 +++++++++++
 fontconfig/urw-fallback-specifics.conf | 138 ++++++++++++++
 fontconfig/urw-fallback.conf           | 332 ---------------------------------
 4 files changed, 378 insertions(+), 332 deletions(-)
 create mode 100644 fontconfig/urw-fallback-backwards.conf
 create mode 100644 fontconfig/urw-fallback-generics.conf
 create mode 100644 fontconfig/urw-fallback-specifics.conf
 delete mode 100644 fontconfig/urw-fallback.conf
 diff --git a/fontconfig/urw-fallback-backwards.conf b/fontconfig/urw-fallback-backwards.conf
 new file mode 100644
 index 0000000..d714ac6
 --- /dev/null
 +++ b/fontconfig/urw-fallback-backwards.conf
@@ -0,0 +1,136 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 +
 +<!--
 +This file is used to alias/map previous versions of font families from (URW)++
 +to similar/metric-conmpatible font families of latest font versions from
 +(URW)++ itself.
 +
 +Most likely this aliasing/mapping will be useful for people who:
 + * have latest versions of (URW)++ fonts, but their documents still reference
 +   or requires older versions of these fonts
 +
 +latest URW fonts:     previous URW fonts:
 +====================  =============================================
 +Nimbus Mono PS        Nimbus Mono L | Nimbus Mono
 +URW Gothic            URW Gothic L
 +URW Bookman           URW Bookman L | Bookman URW
 +Z003                  URW Chancery L | Chancery URW
 +D050000L              Dingbats
 +Nimbus Sans           Nimbus Sans L
 +Nimbus Sans Narrow    Nimbus Sans Narrow (same as current name)
 +C059                  Century Schoolbook L | Century SchoolBook URW
 +P052                  URW Palladio L | Palladio URW
 +Standard Symbols PS   Standard Symbols L
 +Nimbus Roman          Nimbus Roman No9 L
 +-->
 +
 +<fontconfig>
 +  <!-- Substitutions for backward compatibility with previous versions -->
 +  <alias binding="same">
 +    <family>Century Schoolbook L</family>
 +    <accept>
 +      <family>C059</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Century SchoolBook URW</family>
 +    <accept>
 +      <family>C059</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Dingbats</family>
 +    <accept>
 +      <family>D050000L</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Nimbus Mono</family>
 +    <accept>
 +      <family>Nimbus Mono PS</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Nimbus Mono L</family>
 +    <accept>
 +      <family>Nimbus Mono PS</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Nimbus Roman No9 L</family>
 +    <accept>
 +      <family>Nimbus Roman</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Nimbus Sans L</family>
 +    <accept>
 +      <family>Nimbus Sans</family>
 +    </accept>
 +  </alias>
 +
 +  <!-- NOTE: Currently there are no previous versions for Nimbus Sans Narrow -->
 +
 +  <alias binding="same">
 +    <family>Palladio URW</family>
 +    <accept>
 +      <family>P052</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>URW Palladio L</family>
 +    <accept>
 +      <family>P052</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Standard Symbols L</family>
 +    <accept>
 +      <family>Standard Symbols PS</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Bookman URW</family>
 +    <accept>
 +      <family>URW Bookman</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>URW Bookman L</family>
 +    <accept>
 +      <family>URW Bookman</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>URW Gothic L</family>
 +    <accept>
 +      <family>URW Gothic</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Chancery URW</family>
 +    <accept>
 +      <family>Z003</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>URW Chancery L</family>
 +    <accept>
 +      <family>Z003</family>
 +    </accept>
 +  </alias>
 +</fontconfig>
 diff --git a/fontconfig/urw-fallback-generics.conf b/fontconfig/urw-fallback-generics.conf
 new file mode 100644
 index 0000000..5a51868
 --- /dev/null
 +++ b/fontconfig/urw-fallback-generics.conf
@@ -0,0 +1,104 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 +
 +<!--
 +This file is used to alias/map previous versions of font families from (URW)++
 +to similar/metric-compatible font families - in this case the original
 +PostScript fonts (as generics).
 +
 +Most likely this aliasing/mapping will be useful for people who:
 + * have original PostScript fonts installed, but their documents require some
 +   older versions of (URW)++ fonts
 +
 +PostScript fonts:       previous URW fonts:
 +======================  =============================================
 +Courier                 Nimbus Mono L | Nimbus Mono
 +ITC Avant Garde Gothic  URW Gothic L
 +ITC Bookman             URW Bookman L | Bookman URW
 +ITC Zapf Chancery       URW Chancery L | Chancery URW
 +ITC Zapf Dingbats       Dingbats
 +Helvetica               Nimbus Sans L
 +Helvetica Narrow        Nimbus Sans Narrow (same as current name)
 +New Century Schoolbook  Century Schoolbook L | Century SchoolBook URW
 +Palatino                URW Palladio L | Palladio URW
 +Symbol                  Standard Symbols L
 +Times                   Nimbus Roman No9 L
 +-->
 +
 +<fontconfig>
 +  <!-- Map generics to specifics -->
 +  <alias binding="same">
 +    <family>Courier</family>
 +    <accept>
 +      <family>Nimbus Mono</family>
 +      <family>Nimbus Mono L</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Helvetica</family>
 +    <accept>
 +      <family>Nimbus Sans L</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>ITC Avant Garde Gothic</family>
 +    <accept>
 +      <family>URW Gothic L</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>ITC Bookman</family>
 +    <accept>
 +      <family>Bookman URW</family>
 +      <family>URW Bookman L</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>ITC Zapf Chancery</family>
 +    <accept>
 +      <family>Chancery URW</family>
 +      <family>URW Chancery L</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>ITC Zapf Dingbats</family>
 +    <accept>
 +      <family>Dingbats</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>New Century Schoolbook</family>
 +    <accept>
 +      <family>Century Schoolbook L</family>
 +      <family>Century SchoolBook URW</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Palatino</family>
 +    <accept>
 +      <family>Palladio URW</family>
 +      <family>URW Palladio L</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Symbol</family>
 +    <accept>
 +      <family>Standard Symbols L</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Times</family>
 +    <accept>
 +      <family>Nimbus Roman No9 L</family>
 +    </accept>
 +  </alias>
 +</fontconfig>
 diff --git a/fontconfig/urw-fallback-specifics.conf b/fontconfig/urw-fallback-specifics.conf
 new file mode 100644
 index 0000000..04241a9
 --- /dev/null
 +++ b/fontconfig/urw-fallback-specifics.conf
@@ -0,0 +1,138 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 +
 +<!--
 +This file is used to alias/map previous versions of font families from (URW)++
 +to similar/metric-compatible font families - in this case as original PostScript
 +fonts (as specifics).
 +
 +NOTE: These mappings are already part of fontconfig's config files by default.
 +      We are keeping this file just to be complete, or if some distribution
 +      needs it in some special case.
 +
 +Most likely this aliasing/mapping will be useful for people who:
 + * have documents referencing older versions of the (URW)++ fonts, and need to
 +   map their similar/metric-compatible fonts via generic font names
 +
 +PostScript fonts:       latest URW fonts:     previous URW fonts:
 +======================  ====================  =============================================
 +Courier                 Nimbus Mono PS        Nimbus Mono L | Nimbus Mono
 +ITC Avant Garde Gothic  URW Gothic            URW Gothic L
 +ITC Bookman             URW Bookman           URW Bookman L | Bookman URW
 +ITC Zapf Chancery       Z003                  URW Chancery L | Chancery URW
 +ITC Zapf Dingbats       D050000L              Dingbats
 +Helvetica               Nimbus Sans           Nimbus Sans L
 +Helvetica Narrow        Nimbus Sans Narrow    Nimbus Sans Narrow (same as current name)
 +New Century Schoolbook  C059                  Century Schoolbook L | Century SchoolBook URW
 +Palatino                P052                  URW Palladio L | Palladio URW
 +Symbol                  Standard Symbols PS   Standard Symbols L
 +Times                   Nimbus Roman          Nimbus Roman No9 L
 +-->
 +
 +<fontconfig>
 +  <!-- Original PostScript base font mapping -->
 +  <alias binding="same">
 +    <family>Nimbus Mono</family>
 +    <default>
 +      <family>Courier</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Nimbus Mono L</family>
 +    <default>
 +      <family>Courier</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Nimbus Sans L</family>
 +    <default>
 +      <family>Helvetica</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>URW Gothic L</family>
 +    <default>
 +      <family>ITC Avant Garde Gothic</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Bookman URW</family>
 +    <default>
 +      <family>ITC Bookman</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>URW Bookman L</family>
 +    <default>
 +      <family>ITC Bookman</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Chancery URW</family>
 +    <default>
 +      <family>ITC Zapf Chancery</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>URW Chancery L</family>
 +    <default>
 +      <family>ITC Zapf Chancery</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Dingbats</family>
 +    <default>
 +      <family>ITC Zapf Dingbats</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Century Schoolbook L</family>
 +    <default>
 +      <family>New Century Schoolbook</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Century SchoolBook URW</family>
 +    <default>
 +      <family>New Century Schoolbook</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Palladio URW</family>
 +    <default>
 +      <family>Palatino</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>URW Palladio L</family>
 +    <default>
 +      <family>Palatino</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Standard Symbols L</family>
 +    <default>
 +      <family>Symbol</family>
 +    </default>
 +  </alias>
 +
 +  <alias binding="same">
 +    <family>Nimbus Roman No9 L</family>
 +    <default>
 +      <family>Times</family>
 +    </default>
 +  </alias>
 +</fontconfig>
 diff --git a/fontconfig/urw-fallback.conf b/fontconfig/urw-fallback.conf
 deleted file mode 100644
 index b9771b1..0000000
 --- a/fontconfig/urw-fallback.conf
 +++ /dev/null
@@ -1,332 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 -
 -<!--
 -This file is used to alias/map previous versions of font families from (URW)++
 -to similar/metric-compatible font families - either original PostScript fonts
 -(as generics), or newer font versions from (URW)++ itself.
 -
 -Most likely this aliasing/mapping will be useful for people who:
 - * have latest versions of (URW)++ fonts, but their documents still reference
 -   or requires older versions of these fonts
 - * have original PostScript fons installed, but their documents require some
 -   older versions of (URW)++ fonts
 -
 -PostScript fonts:       latest URW fonts:     previous URW fonts:
 -======================  ====================  =============================================
 -Courier                 Nimbus Mono PS        Nimbus Mono L | Nimbus Mono
 -ITC Avant Garde Gothic  URW Gothic            URW Gothic L
 -ITC Bookman             URW Bookman           URW Bookman L | Bookman URW
 -ITC Zapf Chancery       Z003                  URW Chancery L | Chancery URW
 -ITC Zapf Dingbats       D050000L              Dingbats
 -Helvetica               Nimbus Sans           Nimbus Sans L
 -Helvetica Narrow        Nimbus Sans Narrow    Nimbus Sans Narrow (same as current name)
 -New Century Schoolbook  C059                  Century Schoolbook L | Century SchoolBook URW
 -Palatino                P052                  URW Palladio L | Palladio URW
 -Symbol                  Standard Symbols PS   Standard Symbols L
 -Times                   Nimbus Roman          Nimbus Roman No9 L
 -
 -We want for each of them to fallback to any of these available,
 -but in an order preferring similar designs first. We do this in three steps:
 -
 -1) Map each specific font to original PostScript font family,
 -   e.g. Nimbus Mono to Courier
 -
 -2) Map each original PostScript family to its specific font,
 -   e.g. Courier to Nimbus Mono
 -
 -3) Alias all previous names of URW fonts to the latest released version,
 -   e.g. Nimbus Mono to Nimbus Mono PS
 --->
 -
 -<fontconfig>
 -  <!-- Original PostScript base font mapping -->
 -  <alias binding="same">
 -    <family>Nimbus Mono</family>
 -    <default>
 -      <family>Courier</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Nimbus Mono L</family>
 -    <default>
 -      <family>Courier</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Nimbus Sans L</family>
 -    <default>
 -      <family>Helvetica</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>URW Gothic L</family>
 -    <default>
 -      <family>ITC Avant Garde Gothic</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Bookman URW</family>
 -    <default>
 -      <family>ITC Bookman</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>URW Bookman L</family>
 -    <default>
 -      <family>ITC Bookman</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Chancery URW</family>
 -    <default>
 -      <family>ITC Zapf Chancery</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>URW Chancery L</family>
 -    <default>
 -      <family>ITC Zapf Chancery</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Dingbats</family>
 -    <default>
 -      <family>ITC Zapf Dingbats</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Century Schoolbook L</family>
 -    <default>
 -      <family>New Century Schoolbook</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Century SchoolBook URW</family>
 -    <default>
 -      <family>New Century Schoolbook</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Palladio URW</family>
 -    <default>
 -      <family>Palatino</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>URW Palladio L</family>
 -    <default>
 -      <family>Palatino</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Standard Symbols L</family>
 -    <default>
 -      <family>Symbol</family>
 -    </default>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Nimbus Roman No9 L</family>
 -    <default>
 -      <family>Times</family>
 -    </default>
 -  </alias>
 -
 -  <!-- Map generics to specifics -->
 -  <alias binding="same">
 -    <family>Courier</family>
 -    <accept>
 -      <family>Nimbus Mono</family>
 -      <family>Nimbus Mono L</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Helvetica</family>
 -    <accept>
 -      <family>Nimbus Sans L</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>ITC Avant Garde Gothic</family>
 -    <accept>
 -      <family>URW Gothic L</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>ITC Bookman</family>
 -    <accept>
 -      <family>Bookman URW</family>
 -      <family>URW Bookman L</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>ITC Zapf Chancery</family>
 -    <accept>
 -      <family>Chancery URW</family>
 -      <family>URW Chancery L</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>ITC Zapf Dingbats</family>
 -    <accept>
 -      <family>Dingbats</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>New Century Schoolbook</family>
 -    <accept>
 -      <family>Century Schoolbook L</family>
 -      <family>Century SchoolBook URW</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Palatino</family>
 -    <accept>
 -      <family>Palladio URW</family>
 -      <family>URW Palladio L</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Symbol</family>
 -    <accept>
 -      <family>Standard Symbols L</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Times</family>
 -    <accept>
 -      <family>Nimbus Roman No9 L</family>
 -    </accept>
 -  </alias>
 -
 -  <!-- Substitutions for backward compatibility with previous versions -->
 -  <alias binding="same">
 -    <family>Century Schoolbook L</family>
 -    <accept>
 -      <family>C059</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Century SchoolBook URW</family>
 -    <accept>
 -      <family>C059</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Dingbats</family>
 -    <accept>
 -      <family>D050000L</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Nimbus Mono</family>
 -    <accept>
 -      <family>Nimbus Mono PS</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Nimbus Mono L</family>
 -    <accept>
 -      <family>Nimbus Mono PS</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Nimbus Roman No9 L</family>
 -    <accept>
 -      <family>Nimbus Roman</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Nimbus Sans L</family>
 -    <accept>
 -      <family>Nimbus Sans</family>
 -    </accept>
 -  </alias>
 -
 -  <!-- NOTE: Currently there are no previous versions for Nimbus Sans Narrow -->
 -
 -  <alias binding="same">
 -    <family>Palladio URW</family>
 -    <accept>
 -      <family>P052</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>URW Palladio L</family>
 -    <accept>
 -      <family>P052</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Standard Symbols L</family>
 -    <accept>
 -      <family>Standard Symbols PS</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Bookman URW</family>
 -    <accept>
 -      <family>URW Bookman</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>URW Bookman L</family>
 -    <accept>
 -      <family>URW Bookman</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>URW Gothic L</family>
 -    <accept>
 -      <family>URW Gothic</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>Chancery URW</family>
 -    <accept>
 -      <family>Z003</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>URW Chancery L</family>
 -    <accept>
 -      <family>Z003</family>
 -    </accept>
 -  </alias>
 -</fontconfig>
 -- 
 2.9.5
--- a/SOURCES/urw-base35-fonts-20170801-001-appstream-typos-and-syntax-fix.patch
+++ b/SOURCES/urw-base35-fonts-20170801-001-appstream-typos-and-syntax-fix.patch
@ -1,478 +0,0 @@
 From bcef1eb45d251d41721417378a865e8a89a3c12a Mon Sep 17 00:00:00 2001
 From: Fabian Greffrath <fabian@greffrath.com>
 Date: Mon, 2 Oct 2017 11:08:26 +0200
 Subject: [PATCH 1/3] appstream: fix typos and syntax errors
 * "update_conctact" should be "update_contact"
 * XML comments are closed with "-->", i.e. without an extra
   exclamation mark
 Fixes https://github.com/ArtifexSoftware/urw-base35-fonts/issues/10
 ---
 appstream/de.urwpp.C059.metainfo.xml                 |  4 ++--
 appstream/de.urwpp.D050000L.metainfo.xml             |  4 ++--
 appstream/de.urwpp.NimbusMonoPS.metainfo.xml         |  4 ++--
 appstream/de.urwpp.NimbusRoman.metainfo.xml          |  4 ++--
 appstream/de.urwpp.NimbusSans.metainfo.xml           |  4 ++--
 appstream/de.urwpp.NimbusSansNarrow.metainfo.xml     |  4 ++--
 appstream/de.urwpp.P052.metainfo.xml                 |  4 ++--
 appstream/de.urwpp.StandardSymbolsPS.metainfo.xml    |  4 ++--
 appstream/de.urwpp.URWBookman.metainfo.xml           |  4 ++--
 appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml | 10 +++++-----
 appstream/de.urwpp.URWGothic.metainfo.xml            |  4 ++--
 appstream/de.urwpp.Z003.metainfo.xml                 |  4 ++--
 12 files changed, 27 insertions(+), 27 deletions(-)
 diff --git a/appstream/de.urwpp.C059.metainfo.xml b/appstream/de.urwpp.C059.metainfo.xml
 index a022a0e..318e115 100644
 --- a/appstream/de.urwpp.C059.metainfo.xml
 +++ b/appstream/de.urwpp.C059.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>C059</name>
   <summary>An alternative font family for New Century Schoolbook typeface</summary>
@@ -45,7 +45,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.D050000L.metainfo.xml b/appstream/de.urwpp.D050000L.metainfo.xml
 index 107519b..dce5db7 100644
 --- a/appstream/de.urwpp.D050000L.metainfo.xml
 +++ b/appstream/de.urwpp.D050000L.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>D050000L</name>
   <summary>An alternative font for ITC Zapf Dingbats typeface</summary>
@@ -42,7 +42,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.NimbusMonoPS.metainfo.xml b/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
 index 5db4919..4cdf5e1 100644
 --- a/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
 +++ b/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>Nimbus Mono PS</name>
   <summary>An alternative font family for Courier typeface</summary>
@@ -45,7 +45,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.NimbusRoman.metainfo.xml b/appstream/de.urwpp.NimbusRoman.metainfo.xml
 index 447857f..a085577 100644
 --- a/appstream/de.urwpp.NimbusRoman.metainfo.xml
 +++ b/appstream/de.urwpp.NimbusRoman.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>Nimbus Roman</name>
   <summary>An alternative font family for Times New Roman typeface</summary>
@@ -45,7 +45,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.NimbusSans.metainfo.xml b/appstream/de.urwpp.NimbusSans.metainfo.xml
 index 1aa3468..28d9c96 100644
 --- a/appstream/de.urwpp.NimbusSans.metainfo.xml
 +++ b/appstream/de.urwpp.NimbusSans.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>Nimbus Sans</name>
   <summary>An alternative font family for Helvetica typeface</summary>
@@ -45,7 +45,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml b/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
 index cdc133b..3db3163 100644
 --- a/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
 +++ b/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>Nimbus Sans Narrow</name>
   <summary>An alternative font family for Helvetica Condensed typeface</summary>
@@ -45,7 +45,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.P052.metainfo.xml b/appstream/de.urwpp.P052.metainfo.xml
 index 32dbb35..c7dc06a 100644
 --- a/appstream/de.urwpp.P052.metainfo.xml
 +++ b/appstream/de.urwpp.P052.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>P052</name>
   <summary>An alternative font family for Palatino typeface</summary>
@@ -45,7 +45,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml b/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
 index aaab157..88c102e 100644
 --- a/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
 +++ b/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>Standard Symbols PS</name>
   <summary>An alternative font for Symbol typeface</summary>
@@ -42,7 +42,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.URWBookman.metainfo.xml b/appstream/de.urwpp.URWBookman.metainfo.xml
 index bd3211f..369dc52 100644
 --- a/appstream/de.urwpp.URWBookman.metainfo.xml
 +++ b/appstream/de.urwpp.URWBookman.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>URW Bookman</name>
   <summary>An alternative font family for ITC Bookman typeface</summary>
@@ -45,7 +45,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml b/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
 index 0a0c19a..ba2988a 100644
 --- a/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
 +++ b/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
@@ -9,9 +9,9 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
 -  <!-- NOTE: This is a meta-package to install all the Level 2 fonts --!>
 +  <!-- NOTE: This is a meta-package to install all the Level 2 fonts -->
   <name>(URW)++ Core Font Set [Level 2]</name>
   <summary>An alternative font family for New Century Schoolbook typeface</summary>
   <description>
@@ -64,15 +64,15 @@
     <font>Z003 Medium Italic</font>
   </provides>
 -  <!-- NOTE: No <suggests/> tag here, this metapackages provides all fonts ^--!>
 +  <!-- NOTE: No <suggests/> tag here, this metapackages provides all fonts ^-->
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
   </releases>
 -  <!-- NOTE: These font locales are superset of all languages supported --!>
 +  <!-- NOTE: These font locales are superset of all languages supported -->
   <languages>
     <lang>aa</lang>
     <lang>af</lang>
 diff --git a/appstream/de.urwpp.URWGothic.metainfo.xml b/appstream/de.urwpp.URWGothic.metainfo.xml
 index 699f169..9fe308d 100644
 --- a/appstream/de.urwpp.URWGothic.metainfo.xml
 +++ b/appstream/de.urwpp.URWGothic.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>URW Gothic</name>
   <summary>An alternative font family for ITC Avant Garde Gothic typeface</summary>
@@ -45,7 +45,7 @@
     <id>de.urwpp.Z003</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 diff --git a/appstream/de.urwpp.Z003.metainfo.xml b/appstream/de.urwpp.Z003.metainfo.xml
 index b36065f..f1a4cd7 100644
 --- a/appstream/de.urwpp.Z003.metainfo.xml
 +++ b/appstream/de.urwpp.Z003.metainfo.xml
@@ -9,7 +9,7 @@
   <url type="homepage">https://www.urwpp.de/en/</url>
   <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -  <update_conctact>dkaspar@redhat.com</update_contact>
 +  <update_contact>dkaspar@redhat.com</update_contact>
   <name>Z003</name>
   <summary>An alternative font for ITC Zapf Chancery typeface</summary>
@@ -42,7 +42,7 @@
     <id>de.urwpp.URWGothic</id>
   </suggests>
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
 +  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
   <releases>
     <release version="20170801" date="2017-08-01" />
     <release version="20160926" date="2016-09-26" />
 -- 
 2.9.5
 From d8acb4f4476e081ff8159d33843f57de7d3a8aee Mon Sep 17 00:00:00 2001
 From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
 Date: Tue, 20 Feb 2018 13:24:57 +0100
 Subject: [PATCH 2/3] appstream: added missing </p> XML tag
  This was causing errors in AppStream parsers, causing the AppStream
  files not being used in software centers/updaters...
 ---
 appstream/de.urwpp.C059.metainfo.xml              | 1 +
 appstream/de.urwpp.D050000L.metainfo.xml          | 1 +
 appstream/de.urwpp.NimbusMonoPS.metainfo.xml      | 1 +
 appstream/de.urwpp.NimbusRoman.metainfo.xml       | 1 +
 appstream/de.urwpp.NimbusSans.metainfo.xml        | 1 +
 appstream/de.urwpp.P052.metainfo.xml              | 1 +
 appstream/de.urwpp.StandardSymbolsPS.metainfo.xml | 1 +
 appstream/de.urwpp.URWBookman.metainfo.xml        | 1 +
 appstream/de.urwpp.URWGothic.metainfo.xml         | 1 +
 appstream/de.urwpp.Z003.metainfo.xml              | 1 +
 10 files changed, 10 insertions(+)
 diff --git a/appstream/de.urwpp.C059.metainfo.xml b/appstream/de.urwpp.C059.metainfo.xml
 index 318e115..4c52047 100644
 --- a/appstream/de.urwpp.C059.metainfo.xml
 +++ b/appstream/de.urwpp.C059.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.D050000L.metainfo.xml b/appstream/de.urwpp.D050000L.metainfo.xml
 index dce5db7..292cf23 100644
 --- a/appstream/de.urwpp.D050000L.metainfo.xml
 +++ b/appstream/de.urwpp.D050000L.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.NimbusMonoPS.metainfo.xml b/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
 index 4cdf5e1..a293e23 100644
 --- a/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
 +++ b/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.NimbusRoman.metainfo.xml b/appstream/de.urwpp.NimbusRoman.metainfo.xml
 index a085577..0580780 100644
 --- a/appstream/de.urwpp.NimbusRoman.metainfo.xml
 +++ b/appstream/de.urwpp.NimbusRoman.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.NimbusSans.metainfo.xml b/appstream/de.urwpp.NimbusSans.metainfo.xml
 index 28d9c96..f5ca309 100644
 --- a/appstream/de.urwpp.NimbusSans.metainfo.xml
 +++ b/appstream/de.urwpp.NimbusSans.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.P052.metainfo.xml b/appstream/de.urwpp.P052.metainfo.xml
 index c7dc06a..2504b24 100644
 --- a/appstream/de.urwpp.P052.metainfo.xml
 +++ b/appstream/de.urwpp.P052.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml b/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
 index 88c102e..134e756 100644
 --- a/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
 +++ b/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.URWBookman.metainfo.xml b/appstream/de.urwpp.URWBookman.metainfo.xml
 index 369dc52..c932a29 100644
 --- a/appstream/de.urwpp.URWBookman.metainfo.xml
 +++ b/appstream/de.urwpp.URWBookman.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.URWGothic.metainfo.xml b/appstream/de.urwpp.URWGothic.metainfo.xml
 index 9fe308d..2fc1e7d 100644
 --- a/appstream/de.urwpp.URWGothic.metainfo.xml
 +++ b/appstream/de.urwpp.URWGothic.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 diff --git a/appstream/de.urwpp.Z003.metainfo.xml b/appstream/de.urwpp.Z003.metainfo.xml
 index f1a4cd7..3d30fd2 100644
 --- a/appstream/de.urwpp.Z003.metainfo.xml
 +++ b/appstream/de.urwpp.Z003.metainfo.xml
@@ -22,6 +22,7 @@
     <p>
       These 35 base fonts are provided freely by (URW++) company,
       and are mainly utilized by Ghostscript, or other applications using it.
 +    </p>
   </description>
   <provides>
 -- 
 2.9.5
 From 1f3399b3a798a99ab7fda0b79c09c6ba8cc1822d Mon Sep 17 00:00:00 2001
 From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
 Date: Wed, 28 Feb 2018 10:27:23 +0100
 Subject: [PATCH 3/3] appstream: fix the copy-paste error in summary
  ... in de.urwpp.URWCoreFontSetLevel2.metainfo.xml
  Resolves: #21
 ---
 appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml b/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
 index ba2988a..f3bf95b 100644
 --- a/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
 +++ b/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
@@ -13,7 +13,7 @@
   <!-- NOTE: This is a meta-package to install all the Level 2 fonts -->
   <name>(URW)++ Core Font Set [Level 2]</name>
 -  <summary>An alternative font family for New Century Schoolbook typeface</summary>
 +  <summary>Core Font Set containing 35 freely distributable fonts from (URW)++</summary>
   <description>
     <p>
       The Level 2 Core Font Set is a PostScript specification of 35 base fonts
 -- 
 2.9.5
--- a/SOURCES/urw-base35-fonts-20170801-002-BdOblique-renamed.patch
+++ b/SOURCES/urw-base35-fonts-20170801-002-BdOblique-renamed.patch
@ -1,39 +0,0 @@
 From 15193de2d6e421af88f9a3297833530b60c40a09 Mon Sep 17 00:00:00 2001
 From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
 Date: Mon, 4 Dec 2017 12:06:02 +0100
 Subject: [PATCH] fonts: NimbusSansNarrow-BdOblique.* renamed to *-BoldOblique
  To sync with:
    https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=efc24229b0ba
  Resolves:
    https://bugs.ghostscript.com/show_bug.cgi?id=698784
 ---
 ...arrow-BdOblique.afm => NimbusSansNarrow-BoldOblique.afm} |   0
 ...arrow-BdOblique.otf => NimbusSansNarrow-BoldOblique.otf} | Bin
 ...sNarrow-BdOblique.t1 => NimbusSansNarrow-BoldOblique.t1} | Bin
 ...arrow-BdOblique.ttf => NimbusSansNarrow-BoldOblique.ttf} | Bin
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename fonts/{NimbusSansNarrow-BdOblique.afm => NimbusSansNarrow-BoldOblique.afm} (100%)
 rename fonts/{NimbusSansNarrow-BdOblique.otf => NimbusSansNarrow-BoldOblique.otf} (100%)
 rename fonts/{NimbusSansNarrow-BdOblique.t1 => NimbusSansNarrow-BoldOblique.t1} (100%)
 rename fonts/{NimbusSansNarrow-BdOblique.ttf => NimbusSansNarrow-BoldOblique.ttf} (100%)
 diff --git a/fonts/NimbusSansNarrow-BdOblique.afm b/fonts/NimbusSansNarrow-BoldOblique.afm
 similarity index 100%
 rename from fonts/NimbusSansNarrow-BdOblique.afm
 rename to fonts/NimbusSansNarrow-BoldOblique.afm
 diff --git a/fonts/NimbusSansNarrow-BdOblique.otf b/fonts/NimbusSansNarrow-BoldOblique.otf
 similarity index 100%
 rename from fonts/NimbusSansNarrow-BdOblique.otf
 rename to fonts/NimbusSansNarrow-BoldOblique.otf
 diff --git a/fonts/NimbusSansNarrow-BdOblique.t1 b/fonts/NimbusSansNarrow-BoldOblique.t1
 similarity index 100%
 rename from fonts/NimbusSansNarrow-BdOblique.t1
 rename to fonts/NimbusSansNarrow-BoldOblique.t1
 diff --git a/fonts/NimbusSansNarrow-BdOblique.ttf b/fonts/NimbusSansNarrow-BoldOblique.ttf
 similarity index 100%
 rename from fonts/NimbusSansNarrow-BdOblique.ttf
 rename to fonts/NimbusSansNarrow-BoldOblique.ttf
 -- 
 2.9.5
--- a/SOURCES/urw-base35-fonts-20170801-003-merge-Nimbus-Sans-Narrow.patch
+++ b/SOURCES/urw-base35-fonts-20170801-003-merge-Nimbus-Sans-Narrow.patch
@ -1,358 +0,0 @@
 From 965bea8798ffe76885e4ea4556155a6df5e7fc4d Mon Sep 17 00:00:00 2001
 From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
 Date: Tue, 9 Jan 2018 13:51:09 +0100
 Subject: [PATCH] appstream/fontconfig: Nimbus Sans Narrow merged into Nimbus
 Sans
  "As mentioned by Microsoft in its WPF font model whitepaper, the CSS
  model and apps only know to manage weight, width or slant qualifiers.
  So anything which is a weight, width or slant qualifier is a font face
  name, and anything else is a different font family." - Nicolas Mailhot
  More info: https://goo.gl/n2unfn
  By this definition, the Nimbus Sans and Nimbus Sans Narrow are the
  same font typefaces, so the AppStream and fontconfig files for Nimbus
  Sans Narrow were merged into corresponding Nimbus Sans files.
 ---
 appstream/de.urwpp.NimbusSans.metainfo.xml       |   5 +
 appstream/de.urwpp.NimbusSansNarrow.metainfo.xml | 190 -----------------------
 fontconfig/urw-nimbus-sans-narrow.conf           |  42 -----
 fontconfig/urw-nimbus-sans.conf                  |  35 +++++
 4 files changed, 40 insertions(+), 232 deletions(-)
 delete mode 100644 appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
 delete mode 100644 fontconfig/urw-nimbus-sans-narrow.conf
 diff --git a/appstream/de.urwpp.NimbusSans.metainfo.xml b/appstream/de.urwpp.NimbusSans.metainfo.xml
 index 28d9c96..be65054 100644
 --- a/appstream/de.urwpp.NimbusSans.metainfo.xml
 +++ b/appstream/de.urwpp.NimbusSans.metainfo.xml
@@ -29,6 +29,11 @@
     <font>Nimbus Sans Italic</font>
     <font>Nimbus Sans Bold</font>
     <font>Nimbus Sans Bold Italic</font>
 +
 +    <font>Nimbus Sans Narrow Regular</font>
 +    <font>Nimbus Sans Narrow Oblique</font>
 +    <font>Nimbus Sans Narrow Bold</font>
 +    <font>Nimbus Sans Narrow Bold Oblique</font>
   </provides>
   <suggests>
 diff --git a/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml b/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
 deleted file mode 100644
 index 3db3163..0000000
 --- a/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
 +++ /dev/null
@@ -1,190 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<component type="font">
 -  <id>de.urwpp.NimbusSansNarrow</id>
 -  <developer_name>URW++ Design and Development GmbH</developer_name>
 -
 -  <metadata_license>CC-BY-4.0</metadata_license>
 -  <project_license>AGPL-3.0</project_license>
 -
 -  <url type="homepage">https://www.urwpp.de/en/</url>
 -  <url type="bugtracker">https://bugs.ghostscript.com/</url>
 -
 -  <update_contact>dkaspar@redhat.com</update_contact>
 -
 -  <name>Nimbus Sans Narrow</name>
 -  <summary>An alternative font family for Helvetica Condensed typeface</summary>
 -  <description>
 -    <p>
 -      This sans-serif font family is an alternative for the Helvetica Condensed
 -      typeface, and is part of Level 2 Core Font Set - PostScript specification
 -      of 35 base fonts that can be used with any PostScript file.
 -    </p>
 -    <p>
 -      These 35 base fonts are provided freely by (URW++) company,
 -      and are mainly utilized by Ghostscript, or other applications using it.
 -  </description>
 -
 -  <provides>
 -    <font>Nimbus Sans Narrow Regular</font>
 -    <font>Nimbus Sans Narrow Oblique</font>
 -    <font>Nimbus Sans Narrow Bold</font>
 -    <font>Nimbus Sans Narrow Bold Oblique</font>
 -  </provides>
 -
 -  <suggests>
 -    <id>de.urwpp.URWCoreFontSetLevel2</id>
 -    <id>de.urwpp.C059</id>
 -    <id>de.urwpp.D050000L</id>
 -    <id>de.urwpp.NimbusMonoPS</id>
 -    <id>de.urwpp.NimbusRoman</id>
 -    <id>de.urwpp.NimbusSans</id>
 -    <id>de.urwpp.P052</id>
 -    <id>de.urwpp.StandardSymbolsPS</id>
 -    <id>de.urwpp.URWBookman</id>
 -    <id>de.urwpp.URWGothic</id>
 -    <id>de.urwpp.Z003</id>
 -  </suggests>
 -
 -  <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
 -  <releases>
 -    <release version="20170801" date="2017-08-01" />
 -    <release version="20160926" date="2016-09-26" />
 -  </releases>
 -
 -  <languages>
 -    <lang>aa</lang>
 -    <lang>af</lang>
 -    <lang>an</lang>
 -    <lang>av</lang>
 -    <lang>ay</lang>
 -    <lang>ba</lang>
 -    <lang>be</lang>
 -    <lang>bg</lang>
 -    <lang>bi</lang>
 -    <lang>br</lang>
 -    <lang>bs</lang>
 -    <lang>bua</lang>
 -    <lang>ca</lang>
 -    <lang>ce</lang>
 -    <lang>ch</lang>
 -    <lang>co</lang>
 -    <lang>crh</lang>
 -    <lang>cs</lang>
 -    <lang>csb</lang>
 -    <lang>cy</lang>
 -    <lang>da</lang>
 -    <lang>de</lang>
 -    <lang>el</lang>
 -    <lang>en</lang>
 -    <lang>eo</lang>
 -    <lang>es</lang>
 -    <lang>et</lang>
 -    <lang>eu</lang>
 -    <lang>fi</lang>
 -    <lang>fil</lang>
 -    <lang>fj</lang>
 -    <lang>fo</lang>
 -    <lang>fr</lang>
 -    <lang>fur</lang>
 -    <lang>fy</lang>
 -    <lang>gd</lang>
 -    <lang>gl</lang>
 -    <lang>gv</lang>
 -    <lang>ho</lang>
 -    <lang>hr</lang>
 -    <lang>hsb</lang>
 -    <lang>ht</lang>
 -    <lang>hu</lang>
 -    <lang>ia</lang>
 -    <lang>id</lang>
 -    <lang>ie</lang>
 -    <lang>ik</lang>
 -    <lang>io</lang>
 -    <lang>is</lang>
 -    <lang>it</lang>
 -    <lang>jv</lang>
 -    <lang>kaa</lang>
 -    <lang>ki</lang>
 -    <lang>kj</lang>
 -    <lang>kk</lang>
 -    <lang>kl</lang>
 -    <lang>ku-tr</lang>
 -    <lang>kum</lang>
 -    <lang>kwm</lang>
 -    <lang>ky</lang>
 -    <lang>la</lang>
 -    <lang>lb</lang>
 -    <lang>lez</lang>
 -    <lang>lg</lang>
 -    <lang>li</lang>
 -    <lang>lt</lang>
 -    <lang>lv</lang>
 -    <lang>mg</lang>
 -    <lang>mh</lang>
 -    <lang>mk</lang>
 -    <lang>mn-mn</lang>
 -    <lang>mo</lang>
 -    <lang>ms</lang>
 -    <lang>mt</lang>
 -    <lang>na</lang>
 -    <lang>nb</lang>
 -    <lang>nds</lang>
 -    <lang>ng</lang>
 -    <lang>nl</lang>
 -    <lang>nn</lang>
 -    <lang>no</lang>
 -    <lang>nr</lang>
 -    <lang>nso</lang>
 -    <lang>ny</lang>
 -    <lang>oc</lang>
 -    <lang>om</lang>
 -    <lang>os</lang>
 -    <lang>pap-an</lang>
 -    <lang>pap-aw</lang>
 -    <lang>pl</lang>
 -    <lang>pt</lang>
 -    <lang>rm</lang>
 -    <lang>rn</lang>
 -    <lang>ro</lang>
 -    <lang>ru</lang>
 -    <lang>rw</lang>
 -    <lang>sc</lang>
 -    <lang>se</lang>
 -    <lang>sel</lang>
 -    <lang>sg</lang>
 -    <lang>sh</lang>
 -    <lang>sk</lang>
 -    <lang>sl</lang>
 -    <lang>sma</lang>
 -    <lang>smj</lang>
 -    <lang>smn</lang>
 -    <lang>sn</lang>
 -    <lang>so</lang>
 -    <lang>sq</lang>
 -    <lang>sr</lang>
 -    <lang>ss</lang>
 -    <lang>st</lang>
 -    <lang>su</lang>
 -    <lang>sv</lang>
 -    <lang>sw</lang>
 -    <lang>tg</lang>
 -    <lang>tk</lang>
 -    <lang>tl</lang>
 -    <lang>tn</lang>
 -    <lang>tr</lang>
 -    <lang>ts</lang>
 -    <lang>tt</lang>
 -    <lang>tyv</lang>
 -    <lang>uk</lang>
 -    <lang>uz</lang>
 -    <lang>vo</lang>
 -    <lang>vot</lang>
 -    <lang>wa</lang>
 -    <lang>wen</lang>
 -    <lang>wo</lang>
 -    <lang>xh</lang>
 -    <lang>yap</lang>
 -    <lang>za</lang>
 -    <lang>zu</lang>
 -  </languages>
 -</component>
 diff --git a/fontconfig/urw-nimbus-sans-narrow.conf b/fontconfig/urw-nimbus-sans-narrow.conf
 deleted file mode 100644
 index 16ef7ac..0000000
 --- a/fontconfig/urw-nimbus-sans-narrow.conf
 +++ /dev/null
@@ -1,42 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 -<fontconfig>
 -  <!-- Generic name aliasing -->
 -  <alias>
 -    <family>sans-serif</family>
 -    <prefer>
 -      <family>Nimbus Sans Narrow</family>
 -    </prefer>
 -  </alias>
 -
 -  <!-- Generic name assignment -->
 -  <alias>
 -    <family>Nimbus Sans Narrow</family>
 -    <default>
 -      <family>sans-serif</family>
 -    </default>
 -  </alias>
 -
 -  <!-- Original PostScript base font mapping -->
 -  <alias binding="same">
 -    <family>Nimbus Sans Narrow</family>
 -    <default>
 -      <family>Helvetica Narrow</family>
 -    </default>
 -  </alias>
 -
 -  <!-- Font substitution rules -->
 -  <alias binding="same">
 -    <family>Helvetica Narrow</family>
 -    <accept>
 -      <family>Nimbus Sans Narrow</family>
 -    </accept>
 -  </alias>
 -
 -  <alias binding="same">
 -    <family>TeX Gyre Heroes Cn</family>
 -    <accept>
 -      <family>Nimbus Sans Narrow</family>
 -    </accept>
 -  </alias>
 -</fontconfig>
 diff --git a/fontconfig/urw-nimbus-sans.conf b/fontconfig/urw-nimbus-sans.conf
 index 782e5e0..0d78408 100644
 --- a/fontconfig/urw-nimbus-sans.conf
 +++ b/fontconfig/urw-nimbus-sans.conf
@@ -9,6 +9,13 @@
     </prefer>
   </alias>
 +  <alias>
 +    <family>sans-serif</family>
 +    <prefer>
 +      <family>Nimbus Sans Narrow</family>
 +    </prefer>
 +  </alias>
 +
   <!-- Generic name assignment -->
   <alias>
     <family>Nimbus Sans</family>
@@ -17,6 +24,13 @@
     </default>
   </alias>
 +  <alias>
 +    <family>Nimbus Sans Narrow</family>
 +    <default>
 +      <family>sans-serif</family>
 +    </default>
 +  </alias>
 +
   <!-- Original PostScript base font mapping -->
   <alias binding="same">
     <family>Nimbus Sans</family>
@@ -25,6 +39,13 @@
     </default>
   </alias>
 +  <alias binding="same">
 +    <family>Nimbus Sans Narrow</family>
 +    <default>
 +      <family>Helvetica Narrow</family>
 +    </default>
 +  </alias>
 +
   <!-- Font substitution rules -->
   <alias binding="same">
     <family>Helvetica</family>
@@ -34,9 +55,23 @@
   </alias>
   <alias binding="same">
 +    <family>Helvetica Narrow</family>
 +    <accept>
 +      <family>Nimbus Sans Narrow</family>
 +    </accept>
 +  </alias>
 +
 +  <alias binding="same">
     <family>TeX Gyre Heroes</family>
     <accept>
       <family>Nimbus Sans</family>
     </accept>
   </alias>
 +
 +  <alias binding="same">
 +    <family>TeX Gyre Heroes Cn</family>
 +    <accept>
 +      <family>Nimbus Sans Narrow</family>
 +    </accept>
 +  </alias>
 </fontconfig>
 -- 
 2.9.5
--- a/SPECS/urw-base35-fonts.spec
+++ b/SPECS/urw-base35-fonts.spec
@ -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,7 +175,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. 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.
@ -194,8 +186,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:          20170801
+Version:          20200910
-Release:          10%{?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).
@ -233,10 +225,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}
@ -260,12 +248,7 @@ 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:                                                                          \
@ -322,7 +305,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 +313,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
@ -424,14 +409,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 +434,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 +455,43 @@ xset fp rehash &> /dev/null || :
 # =============================================================================
 %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)
`@ -1,2 +1,2 @@`
	`SOURCES/urw-base35-fonts-20170801.tar.gz`	`SOURCES/urw-base35-fonts-20200910.tar.gz`
	`SOURCES/urw-fonts-1.0.7pre44.tar.bz2`	`SOURCES/urw-fonts-1.0.7pre44.tar.bz2`
`@ -1,2 +1,2 @@`
	`c9d8c9707416ae24dcce8fddf73a2517bf42731e SOURCES/urw-base35-fonts-20170801.tar.gz`	`57759a9089026927156907f59888c6c5ce493ef8 SOURCES/urw-base35-fonts-20200910.tar.gz`
	`465fd5faab9ba9e7590f1bf761015862eb09748d SOURCES/urw-fonts-1.0.7pre44.tar.bz2`	`465fd5faab9ba9e7590f1bf761015862eb09748d SOURCES/urw-fonts-1.0.7pre44.tar.bz2`