From c46d3a4d3aa8b54373e86b4ac9918d8809d56168 Mon Sep 17 00:00:00 2001 From: Frank Dana (FeRD) Date: Apr 15 2022 03:29:12 +0000 Subject: Fonts Policy: Fix rpm-spec source block tags --- diff --git a/guidelines/modules/ROOT/pages/FontsPolicy.adoc b/guidelines/modules/ROOT/pages/FontsPolicy.adoc index cf8838d..bc201ed 100644 --- a/guidelines/modules/ROOT/pages/FontsPolicy.adoc +++ b/guidelines/modules/ROOT/pages/FontsPolicy.adoc @@ -356,7 +356,7 @@ Be aware that this particular order was selected after reworking a large pool of This pattern starts with a block of traditional `spec` declarations: .SRPM generic declarations -[source,RPMSpec] +[source,rpm-spec] ---- Version: Release: @@ -384,7 +384,7 @@ Those identifiers are followed by variables, containing: %\{fontdocsex}:: exclusions from the `%\{fontdocs}` list .Shared font declarations -[source,RPMSpec] +[source,rpm-spec] ---- %global foundry SIL %global fontlicense OFL @@ -413,7 +413,7 @@ Followed by: %\{fontdescription}:: a multi-line description block for the generated package. Each line should be less than 80 columns in length. .Family-specific font declarations -[source,RPMSpec] +[source,rpm-spec] ---- %global fontfamily Andika %global fontsummary SIL Andika, a font family for literacy and beginning readers @@ -431,7 +431,7 @@ one another.} Then package sources are declared the usual way. .Source declarations -[source,RPMSpec] +[source,rpm-spec] ---- Source: Source10: [number]-%{fontpkgname}.conf @@ -457,7 +457,7 @@ All those declarations are used and processed in the rest of the `spec` file by %fontfiles:: generate font package `%file` lists .Remainer of the spec file -[source,RPMSpec] +[source,rpm-spec] ---- %fontpkg @@ -483,7 +483,7 @@ All those declarations are used and processed in the rest of the `spec` file by Putting it all together: .spectemplate-fonts-0-simple.spec -[source,RPMSpec] +[source,rpm-spec] ---- include::{examplesdir}/fonts/spectemplate-fonts-0-simple.spec[] ---- @@ -507,7 +507,7 @@ One more shell glob list: %\{fontpkgheader}:: multi-line container for package header directives .Semi-complex family declaration -[source,RPMSpec] +[source,rpm-spec] ---- %global fontfamily PT Sans %global fontsummary PT Sans, a grotesque pan-Cyrillic font family @@ -538,7 +538,7 @@ from the Russian Federal Agency for Press and Mass Communications.} Bulky documentation can be split in a separate subpackage .Documentation subpackage -[source,RPMSpec] +[source,rpm-spec] ---- %package doc Summary: %{name} optional documentation files @@ -565,7 +565,7 @@ Text files published for other systems may need recoding. Putting it all together: .spectemplate-fonts-1-full.spec -[source,RPMSpec] +[source,rpm-spec] ---- include::{examplesdir}/fonts/spectemplate-fonts-1-full.spec[] ---- @@ -586,7 +586,7 @@ Those patterns can be extended the following way, when packaging multiple font f A variable, can be used to share a description block: .Using a common description variable -[source,RPMSpec] +[source,rpm-spec] ---- %global common_description %{expand: IBM wanted Plex to be a distinctive, yet timeless workhorse — an alternative to @@ -645,7 +645,7 @@ little something for developers, because monospace does not need to be monotone. * `-z [numbers]` restrict metapackaging to `[numbers]`è space-separated list of font package suffixes .Complex metapackaging example -[source,RPMSpec] +[source,rpm-spec] ---- %fontmetapkg -z 1,2,3 @@ -664,7 +664,7 @@ Cyrillic. Putting it all together: .spectemplate-fonts-2-multi.spec -[source,RPMSpec] +[source,rpm-spec] ---- include::{examplesdir}/fonts/spectemplate-fonts-2-multi.spec[] ---- @@ -689,7 +689,7 @@ Do not declare a zero/no-suffix family-specific block, as it will attempt to gen Putting it all together: .spectemplate-fonts-3-sub.spec -[source,RPMSpec] +[source,rpm-spec] ---- include::{examplesdir}/fonts/spectemplate-fonts-3-sub.spec[] ----