From ac84b494d02a59ee218f3b6d6c1ece6ce0cee737 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2019 12:51:37 +0000 Subject: import urw-base35-fonts-20170801-10.el8 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..77e895d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/urw-base35-fonts-20170801.tar.gz +SOURCES/urw-fonts-1.0.7pre44.tar.bz2 diff --git a/.urw-base35-fonts.metadata b/.urw-base35-fonts.metadata new file mode 100644 index 0000000..b38ea3f --- /dev/null +++ b/.urw-base35-fonts.metadata @@ -0,0 +1,2 @@ +c9d8c9707416ae24dcce8fddf73a2517bf42731e SOURCES/urw-base35-fonts-20170801.tar.gz +465fd5faab9ba9e7590f1bf761015862eb09748d SOURCES/urw-fonts-1.0.7pre44.tar.bz2 diff --git a/SOURCES/urw-base35-fonts-20170801-000-split-urw-fallback.patch b/SOURCES/urw-base35-fonts-20170801-000-split-urw-fallback.patch new file mode 100644 index 0000000..b0374a9 --- /dev/null +++ b/SOURCES/urw-base35-fonts-20170801-000-split-urw-fallback.patch @@ -0,0 +1,755 @@ +From 70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9 Mon Sep 17 00:00:00 2001 +From: "David Kaspar [Dee'Kej]" +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 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ Century Schoolbook L ++ ++ C059 ++ ++ ++ ++ ++ Century SchoolBook URW ++ ++ C059 ++ ++ ++ ++ ++ Dingbats ++ ++ D050000L ++ ++ ++ ++ ++ Nimbus Mono ++ ++ Nimbus Mono PS ++ ++ ++ ++ ++ Nimbus Mono L ++ ++ Nimbus Mono PS ++ ++ ++ ++ ++ Nimbus Roman No9 L ++ ++ Nimbus Roman ++ ++ ++ ++ ++ Nimbus Sans L ++ ++ Nimbus Sans ++ ++ ++ ++ ++ ++ ++ Palladio URW ++ ++ P052 ++ ++ ++ ++ ++ URW Palladio L ++ ++ P052 ++ ++ ++ ++ ++ Standard Symbols L ++ ++ Standard Symbols PS ++ ++ ++ ++ ++ Bookman URW ++ ++ URW Bookman ++ ++ ++ ++ ++ URW Bookman L ++ ++ URW Bookman ++ ++ ++ ++ ++ URW Gothic L ++ ++ URW Gothic ++ ++ ++ ++ ++ Chancery URW ++ ++ Z003 ++ ++ ++ ++ ++ URW Chancery L ++ ++ Z003 ++ ++ ++ +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 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ Courier ++ ++ Nimbus Mono ++ Nimbus Mono L ++ ++ ++ ++ ++ Helvetica ++ ++ Nimbus Sans L ++ ++ ++ ++ ++ ITC Avant Garde Gothic ++ ++ URW Gothic L ++ ++ ++ ++ ++ ITC Bookman ++ ++ Bookman URW ++ URW Bookman L ++ ++ ++ ++ ++ ITC Zapf Chancery ++ ++ Chancery URW ++ URW Chancery L ++ ++ ++ ++ ++ ITC Zapf Dingbats ++ ++ Dingbats ++ ++ ++ ++ ++ New Century Schoolbook ++ ++ Century Schoolbook L ++ Century SchoolBook URW ++ ++ ++ ++ ++ Palatino ++ ++ Palladio URW ++ URW Palladio L ++ ++ ++ ++ ++ Symbol ++ ++ Standard Symbols L ++ ++ ++ ++ ++ Times ++ ++ Nimbus Roman No9 L ++ ++ ++ +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 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ Nimbus Mono ++ ++ Courier ++ ++ ++ ++ ++ Nimbus Mono L ++ ++ Courier ++ ++ ++ ++ ++ Nimbus Sans L ++ ++ Helvetica ++ ++ ++ ++ ++ URW Gothic L ++ ++ ITC Avant Garde Gothic ++ ++ ++ ++ ++ Bookman URW ++ ++ ITC Bookman ++ ++ ++ ++ ++ URW Bookman L ++ ++ ITC Bookman ++ ++ ++ ++ ++ Chancery URW ++ ++ ITC Zapf Chancery ++ ++ ++ ++ ++ URW Chancery L ++ ++ ITC Zapf Chancery ++ ++ ++ ++ ++ Dingbats ++ ++ ITC Zapf Dingbats ++ ++ ++ ++ ++ Century Schoolbook L ++ ++ New Century Schoolbook ++ ++ ++ ++ ++ Century SchoolBook URW ++ ++ New Century Schoolbook ++ ++ ++ ++ ++ Palladio URW ++ ++ Palatino ++ ++ ++ ++ ++ URW Palladio L ++ ++ Palatino ++ ++ ++ ++ ++ Standard Symbols L ++ ++ Symbol ++ ++ ++ ++ ++ Nimbus Roman No9 L ++ ++ Times ++ ++ ++ +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 @@ +- +- +- +- +- +- +- +- +- Nimbus Mono +- +- Courier +- +- +- +- +- Nimbus Mono L +- +- Courier +- +- +- +- +- Nimbus Sans L +- +- Helvetica +- +- +- +- +- URW Gothic L +- +- ITC Avant Garde Gothic +- +- +- +- +- Bookman URW +- +- ITC Bookman +- +- +- +- +- URW Bookman L +- +- ITC Bookman +- +- +- +- +- Chancery URW +- +- ITC Zapf Chancery +- +- +- +- +- URW Chancery L +- +- ITC Zapf Chancery +- +- +- +- +- Dingbats +- +- ITC Zapf Dingbats +- +- +- +- +- Century Schoolbook L +- +- New Century Schoolbook +- +- +- +- +- Century SchoolBook URW +- +- New Century Schoolbook +- +- +- +- +- Palladio URW +- +- Palatino +- +- +- +- +- URW Palladio L +- +- Palatino +- +- +- +- +- Standard Symbols L +- +- Symbol +- +- +- +- +- Nimbus Roman No9 L +- +- Times +- +- +- +- +- +- Courier +- +- Nimbus Mono +- Nimbus Mono L +- +- +- +- +- Helvetica +- +- Nimbus Sans L +- +- +- +- +- ITC Avant Garde Gothic +- +- URW Gothic L +- +- +- +- +- ITC Bookman +- +- Bookman URW +- URW Bookman L +- +- +- +- +- ITC Zapf Chancery +- +- Chancery URW +- URW Chancery L +- +- +- +- +- ITC Zapf Dingbats +- +- Dingbats +- +- +- +- +- New Century Schoolbook +- +- Century Schoolbook L +- Century SchoolBook URW +- +- +- +- +- Palatino +- +- Palladio URW +- URW Palladio L +- +- +- +- +- Symbol +- +- Standard Symbols L +- +- +- +- +- Times +- +- Nimbus Roman No9 L +- +- +- +- +- +- Century Schoolbook L +- +- C059 +- +- +- +- +- Century SchoolBook URW +- +- C059 +- +- +- +- +- Dingbats +- +- D050000L +- +- +- +- +- Nimbus Mono +- +- Nimbus Mono PS +- +- +- +- +- Nimbus Mono L +- +- Nimbus Mono PS +- +- +- +- +- Nimbus Roman No9 L +- +- Nimbus Roman +- +- +- +- +- Nimbus Sans L +- +- Nimbus Sans +- +- +- +- +- +- +- Palladio URW +- +- P052 +- +- +- +- +- URW Palladio L +- +- P052 +- +- +- +- +- Standard Symbols L +- +- Standard Symbols PS +- +- +- +- +- Bookman URW +- +- URW Bookman +- +- +- +- +- URW Bookman L +- +- URW Bookman +- +- +- +- +- URW Gothic L +- +- URW Gothic +- +- +- +- +- Chancery URW +- +- Z003 +- +- +- +- +- URW Chancery L +- +- Z003 +- +- +- +-- +2.9.5 + diff --git 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 new file mode 100644 index 0000000..c11bcdb --- /dev/null +++ b/SOURCES/urw-base35-fonts-20170801-001-appstream-typos-and-syntax-fix.patch @@ -0,0 +1,478 @@ +From bcef1eb45d251d41721417378a865e8a89a3c12a Mon Sep 17 00:00:00 2001 +From: Fabian Greffrath +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + C059 + An alternative font family for New Century Schoolbook typeface +@@ -45,7 +45,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + D050000L + An alternative font for ITC Zapf Dingbats typeface +@@ -42,7 +42,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + Nimbus Mono PS + An alternative font family for Courier typeface +@@ -45,7 +45,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + Nimbus Roman + An alternative font family for Times New Roman typeface +@@ -45,7 +45,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + Nimbus Sans + An alternative font family for Helvetica typeface +@@ -45,7 +45,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + Nimbus Sans Narrow + An alternative font family for Helvetica Condensed typeface +@@ -45,7 +45,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + P052 + An alternative font family for Palatino typeface +@@ -45,7 +45,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + Standard Symbols PS + An alternative font for Symbol typeface +@@ -42,7 +42,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + URW Bookman + An alternative font family for ITC Bookman typeface +@@ -45,7 +45,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + +- ++ + (URW)++ Core Font Set [Level 2] + An alternative font family for New Century Schoolbook typeface + +@@ -64,15 +64,15 @@ + Z003 Medium Italic + + +- ++ + +- ++ + + + + + +- ++ + + aa + af +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + URW Gothic + An alternative font family for ITC Avant Garde Gothic typeface +@@ -45,7 +45,7 @@ + de.urwpp.Z003 + + +- ++ + + + +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 @@ + https://www.urwpp.de/en/ + https://bugs.ghostscript.com/ + +- dkaspar@redhat.com ++ dkaspar@redhat.com + + Z003 + An alternative font for ITC Zapf Chancery typeface +@@ -42,7 +42,7 @@ + de.urwpp.URWGothic + + +- ++ + + + +-- +2.9.5 + + +From d8acb4f4476e081ff8159d33843f57de7d3a8aee Mon Sep 17 00:00:00 2001 +From: "David Kaspar [Dee'Kej]" +Date: Tue, 20 Feb 2018 13:24:57 +0100 +Subject: [PATCH 2/3] appstream: added missing

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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +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 @@ +

+ These 35 base fonts are provided freely by (URW++) company, + and are mainly utilized by Ghostscript, or other applications using it. ++

+ + + +-- +2.9.5 + + +From 1f3399b3a798a99ab7fda0b79c09c6ba8cc1822d Mon Sep 17 00:00:00 2001 +From: "David Kaspar [Dee'Kej]" +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 @@ + + + (URW)++ Core Font Set [Level 2] +- An alternative font family for New Century Schoolbook typeface ++ Core Font Set containing 35 freely distributable fonts from (URW)++ + +

+ The Level 2 Core Font Set is a PostScript specification of 35 base fonts +-- +2.9.5 + diff --git a/SOURCES/urw-base35-fonts-20170801-002-BdOblique-renamed.patch b/SOURCES/urw-base35-fonts-20170801-002-BdOblique-renamed.patch new file mode 100644 index 0000000..2055c15 --- /dev/null +++ b/SOURCES/urw-base35-fonts-20170801-002-BdOblique-renamed.patch @@ -0,0 +1,39 @@ +From 15193de2d6e421af88f9a3297833530b60c40a09 Mon Sep 17 00:00:00 2001 +From: "David Kaspar [Dee'Kej]" +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 + diff --git a/SOURCES/urw-base35-fonts-20170801-003-merge-Nimbus-Sans-Narrow.patch b/SOURCES/urw-base35-fonts-20170801-003-merge-Nimbus-Sans-Narrow.patch new file mode 100644 index 0000000..54d5c2d --- /dev/null +++ b/SOURCES/urw-base35-fonts-20170801-003-merge-Nimbus-Sans-Narrow.patch @@ -0,0 +1,358 @@ +From 965bea8798ffe76885e4ea4556155a6df5e7fc4d Mon Sep 17 00:00:00 2001 +From: "David Kaspar [Dee'Kej]" +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 @@ + Nimbus Sans Italic + Nimbus Sans Bold + Nimbus Sans Bold Italic ++ ++ Nimbus Sans Narrow Regular ++ Nimbus Sans Narrow Oblique ++ Nimbus Sans Narrow Bold ++ Nimbus Sans Narrow Bold Oblique + + + +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 @@ +- +- +- de.urwpp.NimbusSansNarrow +- URW++ Design and Development GmbH +- +- CC-BY-4.0 +- AGPL-3.0 +- +- https://www.urwpp.de/en/ +- https://bugs.ghostscript.com/ +- +- dkaspar@redhat.com +- +- Nimbus Sans Narrow +-

An alternative font family for Helvetica Condensed typeface +- +-

+- 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. +-

+-

+- These 35 base fonts are provided freely by (URW++) company, +- and are mainly utilized by Ghostscript, or other applications using it. +- +- +- +- Nimbus Sans Narrow Regular +- Nimbus Sans Narrow Oblique +- Nimbus Sans Narrow Bold +- Nimbus Sans Narrow Bold Oblique +- +- +- +- de.urwpp.URWCoreFontSetLevel2 +- de.urwpp.C059 +- de.urwpp.D050000L +- de.urwpp.NimbusMonoPS +- de.urwpp.NimbusRoman +- de.urwpp.NimbusSans +- de.urwpp.P052 +- de.urwpp.StandardSymbolsPS +- de.urwpp.URWBookman +- de.urwpp.URWGothic +- de.urwpp.Z003 +- +- +- +- +- +- +- +- +- +- aa +- af +- an +- av +- ay +- ba +- be +- bg +- bi +- br +- bs +- bua +- ca +- ce +- ch +- co +- crh +- cs +- csb +- cy +- da +- de +- el +- en +- eo +- es +- et +- eu +- fi +- fil +- fj +- fo +- fr +- fur +- fy +- gd +- gl +- gv +- ho +- hr +- hsb +- ht +- hu +- ia +- id +- ie +- ik +- io +- is +- it +- jv +- kaa +- ki +- kj +- kk +- kl +- ku-tr +- kum +- kwm +- ky +- la +- lb +- lez +- lg +- li +- lt +- lv +- mg +- mh +- mk +- mn-mn +- mo +- ms +- mt +- na +- nb +- nds +- ng +- nl +- nn +- no +- nr +- nso +- ny +- oc +- om +- os +- pap-an +- pap-aw +- pl +- pt +- rm +- rn +- ro +- ru +- rw +- sc +- se +- sel +- sg +- sh +- sk +- sl +- sma +- smj +- smn +- sn +- so +- sq +- sr +- ss +- st +- su +- sv +- sw +- tg +- tk +- tl +- tn +- tr +- ts +- tt +- tyv +- uk +- uz +- vo +- vot +- wa +- wen +- wo +- xh +- yap +- za +- zu +- +- +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 @@ +- +- +- +- +- +- sans-serif +- +- Nimbus Sans Narrow +- +- +- +- +- +- Nimbus Sans Narrow +- +- sans-serif +- +- +- +- +- +- Nimbus Sans Narrow +- +- Helvetica Narrow +- +- +- +- +- +- Helvetica Narrow +- +- Nimbus Sans Narrow +- +- +- +- +- TeX Gyre Heroes Cn +- +- Nimbus Sans Narrow +- +- +- +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 @@ + + + ++ ++ sans-serif ++ ++ Nimbus Sans Narrow ++ ++ ++ + + + Nimbus Sans +@@ -17,6 +24,13 @@ + + + ++ ++ Nimbus Sans Narrow ++ ++ sans-serif ++ ++ ++ + + + Nimbus Sans +@@ -25,6 +39,13 @@ + + + ++ ++ Nimbus Sans Narrow ++ ++ Helvetica Narrow ++ ++ ++ + + + Helvetica +@@ -34,9 +55,23 @@ + + + ++ Helvetica Narrow ++ ++ Nimbus Sans Narrow ++ ++ ++ ++ + TeX Gyre Heroes + + Nimbus Sans + + ++ ++ ++ TeX Gyre Heroes Cn ++ ++ Nimbus Sans Narrow ++ ++ + +-- +2.9.5 + diff --git a/SPECS/urw-base35-fonts.spec b/SPECS/urw-base35-fonts.spec new file mode 100644 index 0000000..06cde96 --- /dev/null +++ b/SPECS/urw-base35-fonts.spec @@ -0,0 +1,530 @@ +# +# Important notes regarding the package: +# ====================================== +# This package contains 35 fonts defined as PostScript Level 2 Core Font Set: +# > https://en.wikipedia.org/wiki/PostScript_fonts#Core_Font_Set +# +# This package is the replacement for previous 'urw-fonts' package (obsolete now). +# +# However, there are currently several issues that needed to be adressed: +# 1) This font set is owned by company (URW)++ [https://www.urwpp.de/en/], but +# the company Artifex Software [http://www.artifex.com/] has negotiated with +# (URW)++ the Open Source release of several fonts that (URW)++ owns, which +# can be used as Level 2 Core Font Set. +# +# Artifex Software is the owner/creator of Ghostscript software, and they use +# those fonts as part of Ghostscript's resources. +# +# However, (URW++) company does not provide any way to download those fonts. +# So right now, we are using the fonts which Artifex Software company uses +# in Ghostscript, and made available. They do not officially provide them, +# but they have become the 'de facto' standard across Linux distributions. +# +# Therefore, from now on, I will refer to Artifex Software as to 'upstream'. +# +# 2) Upstream has its own git repository for Core Font Set Level 2 sources: +# > https://github.com/ArtifexSoftware/urw-base35-fonts +# +# Here you can find 4 types of files (regarding the fonts): +# *.t1 - https://en.wikipedia.org/wiki/PostScript_fonts#Type_1 +# *.afm - https://de.wikipedia.org/wiki/Adobe_Font_Metrics +# *.ttf - https://en.wikipedia.org/wiki/TrueType +# *.otf - https://en.wikipedia.org/wiki/OpenType +# +# According to upstream, Ghostscript needs only Type 1 fonts to work properly. +# It can use TTF or OTF fonts as substitutions as well in case the Type 1 +# fonts are missing, but the substitution is not (and can't be) guaranteed to +# be absolutely flawless, unless the fonts use the CFF outlines: +# > https://en.wikipedia.org/wiki/PostScript_fonts#Compact_Font_Format +# +# And even though the OTF font files have CFF outlines embedded inside them, +# those OTF fonts still cause problems when they are used with Ghostscript's +# 'pdfwrite' device as substitutions. This can break printing or conversions +# for many users out there using Ghostscript. At the moment, upstream does +# not have reason/motivation to fix the 'pdfwrite' device in the near future. +# +# The AFM (Adobe Font Metrics) are useful for layout purposes of other +# applications, and they contain general font information and font metrics. +# These AFM files were distributed in the previous 'urw-fonts' package, so in +# order to avoid possible regressions in the future, we need to continue +# distributing them. +# +# However, distributing AFM files would not be possible if we would create +# this package from Ghostscript source package only. It does not contain +# these AFM files, because as stated above - Ghostscript requires only T1 +# fonts. Therefore, we're using the archive with fonts provided from upstream. +# +# +# 3) The previous package 'urw-fonts' shipped the fonts in different format: +# *.pfb - Printer Font Binary (compressed Type 1 fonts, which require an +# 8-bit transmission method) +# *.pfm - Printer Font Metrics (same as *.afm files according to upstream) +# +# These formats were basically replaced with T1 and AFM formats, currently +# used by upstream. +# +# 4) (URW)++ does not have any sane versioning procedure. After reaching +# version 1.10, they returned to version 1.00. That is the reason why +# upstream switched to using git snapshot dates for versioning, and we +# are sticking to that after discussion at fedora-devel mailing list. +# +# 5) The package scheme is this: +# +# * urw-base35-fonts -- Metapackage which does not contain anything, +# but requires all its font subpackages. This +# is a wrapper package to ease-up installation +# of all fonts. +# +# * urw-base35-fonts-common -- Package that contains only the license file, +# to avoid duplication of it and to make the +# font packages size smaller. +# +# * urw-base35-[***]-fonts -- Subpackage of base35 fonts, containing only +# one font family, as required by FPG. +# +# * urw-base35-fonts-devel -- Devel subpackage that provides useful RPM +# macro(s), so other packages can more easily +# build against base35 fonts. +# +# ========================================================================== +# +# urw-base35-fonts ----- urw-base35-fonts-common +# | | +# | | +# \-- urw-base35-[***]-fonts +# +# ========================================================================== +# +# NOTE: Fedora Packaging Guidelines (FPG) requires to use OTF or TTF format: +# https://fedoraproject.org/wiki/Choosing_the_right_font_format_to_package +# +# However, there are several packages in Fedora that still hadn't been +# updated to work with OTF/TTF formats, and thus still require the +# Type1 font format to work correctly. These packages include e.g.: +# * ghostscript +# * ImageMagick +# * hylafax+ +# +# On the other hand, more and more software (e.g. LibreOffice) is +# moving away from Type1 format completely and dropping its support. +# +# As a result, we currently need to ship both OTF and Type1/AFM formats. +# In case all the packages depending on base35 fonts will finally start +# supporting the OTF, then we will make complete switch to OTF only. +# +# ========================================================================== + +# GLOBAL MACROS: +# -------------- +%global fontname urw-base35 +%global fontconfig_prio 61 +%global urw_fonts_vers 3:2.4-25 +%global tmpdir %{_localstatedir}/lib/rpm-state/urw-base35-fonts +%global tmpfile %{tmpdir}/cache-update-needed +%global legacydir %{_datadir}/X11/fonts/urw-fonts + + +# By redefining the '_docdir_fmt' macro we override the default location of +# documentation or license files. Instead of them being located in +# 'urw-base35-fonts-common', they are located in 'urw-base35-fonts' folder. +%global _docdir_fmt %{name} + + +# This will create an auxiliary file if it does not exist, to indicate that X11 +# Logical Font Description database and fontconfig cache needs to be updated. +%global post_scriptlet() \ +( \ + if ! [[ -x %{tmpfile} ]]; then \ + rm -rf %{tmpdir} \ + mkdir -p %{tmpdir} \ + \ + touch %{tmpfile} \ + chmod +x %{tmpfile} \ + fi \ +) + + +# NOTE: At the moment, there's no equivalent of 'posttrans' macro for +# uninstallation, meaning we can only use the 'posttrans'. +# +# Because of it , we have to use 'postun' instead. That means this +# scriptlet will be called for every font family subpackage being +# uninstalled... +%global postun_scriptlet() \ +( \ + 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} \ + fi \ +) + + +%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 \ +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} + +# 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 + +URL: https://www.urwpp.de/en/ +Source: https://github.com/ArtifexSoftware/urw-base35-fonts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: urw-fonts-1.0.7pre44.tar.bz2 + +BuildArch: noarch + +BuildRequires: fontpackages-devel +BuildRequires: libappstream-glib + +BuildRequires: git +BuildRequires: sed + +# --------------- + +Provides: urw-fonts = %{urw_fonts_vers} +Obsoletes: urw-fonts < %{urw_fonts_vers} + +# This is metapackage for installation all font subpackages, require them: +Requires: %{name}-common = %{version}-%{release} +Requires: %{fontname}-bookman-fonts +Requires: %{fontname}-c059-fonts +Requires: %{fontname}-d050000l-fonts +Requires: %{fontname}-gothic-fonts +Requires: %{fontname}-nimbus-mono-ps-fonts +Requires: %{fontname}-nimbus-roman-fonts +Requires: %{fontname}-nimbus-sans-fonts +Requires: %{fontname}-p052-fonts +Requires: %{fontname}-standard-symbols-ps-fonts +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} + +This meta-package will install all the 35 fonts from the %{name}. + +# ============================================================================= + +# Macro for creating a subpackage for a given font family. +# +# 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 ff_filename %(echo %{*} | tr --delete " ") \ +%define subpkg_name %(echo %{*} | tr "A-Z " "a-z-" | sed -e 's/urw-//') \ + \ +%package -n %{fontname}-%{subpkg_name}-fonts \ +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: \ +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: \ +Conflicts: urw-fonts < %{urw_fonts_vers} } \ + \ +%description -n %{fontname}-%{subpkg_name}-fonts \ +This package contains %{*} font family, \ +which is part of Level 2 Core Font Set. \ + \ +%{common_desc} \ + \ +%post -n %{fontname}-%{subpkg_name}-fonts \ +%{post_scriptlet} \ + \ +%postun -n %{fontname}-%{subpkg_name}-fonts \ +%{postun_scriptlet} \ + \ +%posttrans -n %{fontname}-%{subpkg_name}-fonts \ +%{posttrans_scriptlet} \ + \ +%files -n %{fontname}-%{subpkg_name}-fonts \ +%{_fontdir}/%{ff_filename}*.t1 \ +%{_fontdir}/%{ff_filename}*.afm \ +%{_fontdir}/%{ff_filename}*.otf \ +%{_datadir}/appdata/de.urwpp.%{ff_filename}.metainfo.xml \ +%{_datadir}/fontconfig/conf.avail/%{fontconfig_prio}-urw-%{subpkg_name}.conf \ +%{_sysconfdir}/fonts/conf.d/%{fontconfig_prio}-urw-%{subpkg_name}.conf \ +# Temporary workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1534206:\ +%exclude %{_fontdir}/StandardSymbolsPS.otf \ + +# ============================================================================= + +%package common +Summary: Common files of the (URW)++ Level 2 Core Font Set +Requires: filesystem +Requires: fontpackages-filesystem + +%description common +%{common_desc} + +This package contains the necessary license files for this font set. + +# --------------- + +%package devel +Summary: RPM macros related to (URW)++ Level 2 Core Font Set +Requires: %{name} = %{version}-%{release} + +%description devel +%{common_desc} + +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. + +# --------------- + +%package legacy +Summary: Legacy version of (URW)++ Level 2 Core Font Set + +%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. + +# ============================================================================= +# NOTE: When making an update, make sure to check if any font families were +# added/removed. We always need to pack all the fonts into subpackages. +# ============================================================================= + +%fontfamily_subpkg C059 +%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 P052 +%fontfamily_subpkg Standard Symbols PS -c +%fontfamily_subpkg URW Bookman -c +%fontfamily_subpkg URW Gothic -c +%fontfamily_subpkg Z003 + +# ============================================================================= + +# We need to ship the legacy fonts for now as well (BZ #1551219): +%prep +%autosetup -N -S git + +mkdir -p legacy +tar --directory=legacy/ -xf %{SOURCE1} +rm -f legacy/ChangeLog legacy/README* legacy/fonts* + +# Amend all the files to the initial commit, and patch the sources: +git add --all --force +git commit --all --amend --no-edit > /dev/null +%autopatch -p1 + +%install +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0755 -d %{buildroot}%{_datadir}/appdata +install -m 0755 -d %{buildroot}%{_datadir}/fontconfig/conf.avail +install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d +install -m 0755 -d %{buildroot}%{legacydir} +install -m 0755 -d %{buildroot}%{_datadir}/licenses/urw-fonts + +install -m 0644 -p fonts/*.t1 %{buildroot}%{_fontdir} +install -m 0644 -p fonts/*.afm %{buildroot}%{_fontdir} +install -m 0644 -p fonts/*.otf %{buildroot}%{_fontdir} +install -m 0644 -p legacy/*.afm legacy/*.pfm legacy/*.pfb %{buildroot}%{legacydir} +install -m 0644 -p legacy/COPYING %{buildroot}%{_datadir}/licenses/urw-fonts + +install -m 0644 -p appstream/*.metainfo.xml %{buildroot}%{_datadir}/appdata/ + +# Install the fontconfig files with correct priority for our distribution: +for file in fontconfig/*.conf; do + DISTRO_FILENAME="%{fontconfig_prio}-$(basename $file)" + install -m 0644 -p $file %{buildroot}%{_datadir}/fontconfig/conf.avail/$DISTRO_FILENAME + ln -sf %{_datadir}/fontconfig/conf.avail/$DISTRO_FILENAME %{buildroot}%{_sysconfdir}/fonts/conf.d/$DISTRO_FILENAME +done + +# Some of the fontconfig files are not to be shipped: +# * urw-fallback-specifics.conf - these mappings are already provided by fontconfig +# * urw-fallback-generics.conf - no use-cases for this as far as we know +rm -f %{buildroot}%{_datadir}/fontconfig/conf.avail/%{fontconfig_prio}-urw-fallback-{specifics,generics}.conf +rm -f %{buildroot}%{_sysconfdir}/fonts/conf.d/%{fontconfig_prio}-urw-fallback-{specifics,generics}.conf + +# We need to touch these files -- otherwise running 'rpm --setperms' would +# result in these files having incorrect permissions like this: [-------.] +#touch %{buildroot}%{_fontdir}/fonts.dir +#touch %{buildroot}%{_fontdir}/fonts.scale +touch %{buildroot}%{legacydir}/fonts.dir +touch %{buildroot}%{legacydir}/fonts.scale + +# Install the symlink for the X11 Logical Font Description to actually work: +install -m 0755 -d %{buildroot}%{_sysconfdir}/X11/fontpath.d +#ln -sf %{_fontdir} %{buildroot}%{_sysconfdir}/X11/fontpath.d/%{name} +ln -sf %{legacydir} %{buildroot}%{_sysconfdir}/X11/fontpath.d/urw-fonts + +# Generate the macro containing the path to our fonts: +install -m 0755 -d %{buildroot}%{_rpmconfigdir}/macros.d + +cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name} << _EOF +%%urw_base35_fontpath %{_fontdir} +_EOF + +# Check that the AppStream files are valid and safe. Otherwise they might not +# get used in Gnome Software... +%check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.metainfo.xml + +%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 +# by any of the actual font family subpackages. + +# ============================================================================= + +%files +%{_datadir}/appdata/de.urwpp.URWCoreFontSetLevel2.metainfo.xml + +# --------------- + +%files common +%license LICENSE COPYING + +%dir %{_fontdir} +#%ghost %verify (not md5 size mtime) %{_fontdir}/fonts.dir +#%ghost %verify (not md5 size mtime) %{_fontdir}/fonts.scale + +%{_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} + +# --------------- + +%files devel +%{_rpmconfigdir}/macros.d/macros.%{name} + +# --------------- + +%files legacy +%license %{_datadir}/licenses/urw-fonts/COPYING +%ghost %verify (not md5 size mtime) %{legacydir}/fonts.dir +%ghost %verify (not md5 size mtime) %{legacydir}/fonts.scale +%{_sysconfdir}/X11/fontpath.d/urw-fonts +%{legacydir}/*.afm +%{legacydir}/*.pfm +%{legacydir}/*.pfb + +# ============================================================================= + +%changelog +* Mon Jun 18 2018 David Kaspar [Dee'Kej] - 20170801-10 +- fc-cache call dropped (from scriptlets) + +* Fri Apr 06 2018 David Kaspar [Dee'Kej] - 20170801-9 +- *-legacy subpackage introduced (temporary workaround for BZ #1551219) + +* Wed Feb 28 2018 David Kaspar [Dee'Kej] - 20170801-8 +- copy-paste error fixed in de.urwpp.URWCoreFontSetLevel2.metainfo.xml file + +* Wed Feb 21 2018 David Kaspar [Dee'Kej] - 20170801-7 +- added %%check section for validation of AppStream files + +* Mon Feb 19 2018 David Kaspar [Dee'Kej] - 20170801-6 +- temporary workaround for BZ #1534206 + +* Fri Feb 09 2018 Fedora Release Engineering - 20170801-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 11 2018 David Kaspar [Dee'Kej] - 20170801-4 +- added missing Obsoletes/Provides for *-nimbus-sans-narrow subpackage + +* Wed Dec 13 2017 David Kaspar [Dee'Kej] 20170801-3 +- *-devel subpackage added +- typos & syntax fixed for AppStream files +- NimbusSansNarrow-BdOblique.* renamed to *-BoldOblique +- *-nimbus-sans-narrow subpackage dropped +- priority/ordering decreased [60->61] +- ship *.otf format files as well + +* Mon Sep 25 2017 David Kaspar [Dee'Kej] - 20170801-2 +- urw-base35-fonts-20170801-000-split-urw-fallback.patch added +- decrease the fontconfig priority/ordering value to 60 (bug #1494850) +- set same priority value for urw-fallback.conf as for other files (bug #1495199) + +* Fri Sep 22 2017 David Kaspar [Dee'Kej] - 20170801-1 +- rebase to 20170801 version +- removed urw-* string from subpackages +- fontconfig priority value updated to 35 +- error messages from 'xset fp rehash' suppressed (bug #1466254) +- AppStream files added into (sub)packages +- fontconfig files added into (sub)packages +- fixed fonts path during %%install +- source location updated to point at github.com + +* Mon Jun 05 2017 David Kaspar [Dee'Kej] - 20160926-1 +- %%description line in 'fontfamily_subpkg' macro split +- requirement for 'fontpackages-filesystem' added +- mark 'font.dir' and 'font.scale' as %%ghost files +- fix the upgrading process (for Obsoletes|Provides|Conflicts) +- simplify creation of the subpackages with auxiliary %%fontfamily_subpkg macro +- update the fontconfig cache and X11 Logical Font Description database + (during install/update/erase) +- initial version of specfile created +