SPECS/xorg-x11-fonts.spec

@@ -32,44 +32,68 @@ fi										\
 Summary:    X.Org X11 fonts
 Name:       xorg-x11-fonts
 Version:    7.5
-Release:    33%{?dist}
+Release:    39%{?dist}
-License:    MIT and Lucida and Public Domain
+License:    HPND AND Adobe-Utopia AND Cronyx AND MIT AND Lucida-Bitmap-Fonts AND Bitstream-Charter AND X11
 URL:        https://www.x.org
 
 BuildArch:  noarch
 
+# Not copyrightable, see fedora-license-data!394
 Source0:    https://www.x.org/pub/individual/font/encodings-1.0.5.tar.bz2
+# SPDX: HPND
 Source1:    https://www.x.org/pub/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
 Source2:    https://www.x.org/pub/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
+# SPDX: Adobe-Utopia
 Source3:    https://www.x.org/pub/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
 Source4:    https://www.x.org/pub/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
 Source5:    https://www.x.org/pub/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
+# SPDX: Cronyx
 Source6:    https://www.x.org/pub/individual/font/font-alias-1.0.3.tar.bz2
+# SPDX: MIT
 Source7:    https://www.x.org/pub/individual/font/font-arabic-misc-1.0.3.tar.bz2
+# SPDX: Lucida-Bitmap-Fonts
 Source8:    https://www.x.org/pub/individual/font/font-bh-100dpi-1.0.3.tar.bz2
 Source9:    https://www.x.org/pub/individual/font/font-bh-75dpi-1.0.3.tar.bz2
+# Not copyrightable, see fedora-license-data#333
 Source10:   https://www.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
 Source11:   https://www.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
+# SPDX: HPND
 Source12:   https://www.x.org/pub/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
 Source13:   https://www.x.org/pub/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
+# SPDX: Bitstream-Charter
 Source14:   https://www.x.org/pub/individual/font/font-bitstream-type1-1.0.3.tar.bz2
+# SPDX: Cronyx
 Source15:   https://www.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
+# SPDX: LicenseRef-Fedora-UltraPermissive
 Source16:   https://www.x.org/pub/individual/font/font-cursor-misc-1.0.3.tar.bz2
 # Daewoo-misc has no license terms, just Copyright (#1952723)
 # Source17:   https://www.x.org/pub/individual/font/font-daewoo-misc-1.0.3.tar.bz2
+# SPDX: HPND for dec/isas
 Source18:   https://www.x.org/pub/individual/font/font-dec-misc-1.0.3.tar.bz2
 Source19:   https://www.x.org/pub/individual/font/font-isas-misc-1.0.3.tar.bz2
+# Not copyrightable, see fedora-license-data#327
 Source20:   https://www.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2
+# SPDX LicenseRef-Fedora-Public-Domain
 Source21:   https://www.x.org/pub/individual/font/font-micro-misc-1.0.3.tar.bz2
+# SPDX: Cronyx AND LicenseRef-Fedora-Public-Domain AND LicenseRef-Fedora-UltraPermissive
 Source22:   https://www.x.org/pub/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
+# SPDX: MIT
 Source23:   https://www.x.org/pub/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
+# SPDX LicenseRef-Fedora-Public-Domain
 Source24:   https://www.x.org/pub/individual/font/font-misc-misc-1.1.2.tar.bz2
+# SPDX: MIT
 Source25:   https://www.x.org/pub/individual/font/font-mutt-misc-1.0.3.tar.bz2
+# SPDX: HPND
 Source26:   https://www.x.org/pub/individual/font/font-schumacher-misc-1.1.2.tar.bz2
+# SPDX: Cronyx
 Source27:   https://www.x.org/pub/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
+# SPDX: HPND
 Source28:   https://www.x.org/pub/individual/font/font-sony-misc-1.0.3.tar.bz2
+# MIT
 Source29:   https://www.x.org/pub/individual/font/font-sun-misc-1.0.3.tar.bz2
+# SPDX LicenseRef-Fedora-Public-Domain
 Source30:   https://www.x.org/pub/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
+# X11
 Source31:   https://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.bz2
 
 # Luxi fonts are under a bad license
@@ -83,6 +107,7 @@ Source31:   https://www.x.org/pub/individual/font/font-xfree86-type1-1.0.4.tar.b
 # to request for relicensing
 # http://www.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
 
+BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  bdftopcf mkfontscale
 BuildRequires:  font-util >= 1.1.0
@@ -247,7 +272,7 @@ Contains a set of Cyrillic fonts.
 %build
 # Build all apps
 {
-    for app in * ; do
+    for app in encodings-* font-* ; do
         pushd $app
             autoreconf -vif
             case $app in
@@ -280,7 +305,7 @@ Contains a set of Cyrillic fonts.
 %install
 # Install all apps
 {
-    for app in * ; do
+    for app in encodings-* font-* ; do
         pushd $app
             %make_install
         popd
@@ -950,16 +975,36 @@ mkfontdir %{_x11fontdir}/cyrillic || :
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 7.5-33
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 7.5-39
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for MSVSphere 10
-  Related: rhbz#1991688
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 7.5-39
+- Bump release for June 2024 mass rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 29 2023 Peter Hutterer <peter.hutterer@redhat.com> - 7.5-37
+- SPDX migration
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Fri Apr 23 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.5-31
 - Drop the daewoo-misc fonts, they have no upstream license terms and may be
-  proprietary (#1952727)
+  proprietary (#1952723)
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.5-31
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Fri Mar 12 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.5-30
 - Replace the external xorg-x11-fonts-update-dirs script with an rpm macro