From 46872d1e67d1ed08eb8adc742b66cf86d6d700c1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 29 Apr 2021 13:45:09 +1000 Subject: [PATCH] Drop the daewoo-misc fonts, they have no upstream license terms and may be proprietary (#1952727) Resolves: rhbz#1952727 --- .gitignore | 1 - sources | 1 - xorg-x11-fonts.spec | 11 ++++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 003d413..0fec0e8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ font-bitstream-75dpi-1.0.2.tar.bz2 font-bitstream-type1-1.0.2.tar.bz2 font-cronyx-cyrillic-1.0.2.tar.bz2 font-cursor-misc-1.0.2.tar.bz2 -font-daewoo-misc-1.0.2.tar.bz2 font-dec-misc-1.0.2.tar.bz2 font-isas-misc-1.0.2.tar.bz2 font-jis-misc-1.0.2.tar.bz2 diff --git a/sources b/sources index ea8de65..d09d539 100644 --- a/sources +++ b/sources @@ -15,7 +15,6 @@ SHA512 (font-bitstream-75dpi-1.0.3.tar.bz2) = 9311a5b0cbe1613aca87fdf7fd9ab263eb SHA512 (font-bitstream-type1-1.0.3.tar.bz2) = 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61 SHA512 (font-cronyx-cyrillic-1.0.3.tar.bz2) = b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456 SHA512 (font-cursor-misc-1.0.3.tar.bz2) = 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83 -SHA512 (font-daewoo-misc-1.0.3.tar.bz2) = 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06 SHA512 (font-dec-misc-1.0.3.tar.bz2) = af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6 SHA512 (font-isas-misc-1.0.3.tar.bz2) = be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b SHA512 (font-jis-misc-1.0.3.tar.bz2) = 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index a590f32..38b1803 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -32,7 +32,7 @@ fi \ Summary: X.Org X11 fonts Name: xorg-x11-fonts Version: 7.5 -Release: 31%{?dist} +Release: 32%{?dist} License: MIT and Lucida and Public Domain URL: https://www.x.org @@ -55,7 +55,8 @@ Source13: https://www.x.org/pub/individual/font/font-bitstream-75dpi-1.0.3.tar Source14: https://www.x.org/pub/individual/font/font-bitstream-type1-1.0.3.tar.bz2 Source15: https://www.x.org/pub/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2 Source16: https://www.x.org/pub/individual/font/font-cursor-misc-1.0.3.tar.bz2 -Source17: https://www.x.org/pub/individual/font/font-daewoo-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 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 Source20: https://www.x.org/pub/individual/font/font-jis-misc-1.0.3.tar.bz2 @@ -241,7 +242,7 @@ Requires(postun): mkfontdir Contains a set of Cyrillic fonts. %prep -%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 +%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 %build # Build all apps @@ -949,6 +950,10 @@ mkfontdir %{_x11fontdir}/cyrillic || : %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Fri Apr 23 2021 Peter Hutterer 7.5-31 +- Drop the daewoo-misc fonts, they have no upstream license terms and may be + proprietary (#1952727) + * Fri Apr 16 2021 Mohan Boddu - 7.5-31 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937