From 17fd8f405c040887c57ee5728b4bb0c59d6bbec5 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 26 May 2023 13:16:04 +0800 Subject: [PATCH] Update to follow New Fonts Packaging Guidelines --- 66-bitmap-console-opentype.conf | 17 ++ 66-bitmap-console.conf | 2 +- 66-bitmap-fangsongti-opentype.conf | 17 ++ 66-bitmap-fangsongti.conf | 2 +- 66-bitmap-fixed-opentype.conf | 17 ++ 66-bitmap-fixed.conf | 2 +- 66-bitmap-lucida-typewriter-opentype.conf | 17 ++ 66-bitmap-lucida-typewriter.conf | 2 +- COPYING | 339 ++++++++++++++++++++++ bitmap-fonts.spec | 311 ++++++++++---------- tests/tests.yml | 2 +- 11 files changed, 565 insertions(+), 163 deletions(-) create mode 100644 66-bitmap-console-opentype.conf create mode 100644 66-bitmap-fangsongti-opentype.conf create mode 100644 66-bitmap-fixed-opentype.conf create mode 100644 66-bitmap-lucida-typewriter-opentype.conf create mode 100644 COPYING diff --git a/66-bitmap-console-opentype.conf b/66-bitmap-console-opentype.conf new file mode 100644 index 0000000..346623e --- /dev/null +++ b/66-bitmap-console-opentype.conf @@ -0,0 +1,17 @@ + + + + + monospace + + Console + + + + Console + + monospace + + + + diff --git a/66-bitmap-console.conf b/66-bitmap-console.conf index 5bab5e0..346623e 100644 --- a/66-bitmap-console.conf +++ b/66-bitmap-console.conf @@ -1,5 +1,5 @@ - + monospace diff --git a/66-bitmap-fangsongti-opentype.conf b/66-bitmap-fangsongti-opentype.conf new file mode 100644 index 0000000..fe87088 --- /dev/null +++ b/66-bitmap-fangsongti-opentype.conf @@ -0,0 +1,17 @@ + + + + + monospace + + Fangsong ti + + + + Fangsong ti + + monospace + + + + diff --git a/66-bitmap-fangsongti.conf b/66-bitmap-fangsongti.conf index 4100bff..fe87088 100644 --- a/66-bitmap-fangsongti.conf +++ b/66-bitmap-fangsongti.conf @@ -1,5 +1,5 @@ - + monospace diff --git a/66-bitmap-fixed-opentype.conf b/66-bitmap-fixed-opentype.conf new file mode 100644 index 0000000..6d9e445 --- /dev/null +++ b/66-bitmap-fixed-opentype.conf @@ -0,0 +1,17 @@ + + + + + monospace + + Fixed + + + + Fixed + + monospace + + + + diff --git a/66-bitmap-fixed.conf b/66-bitmap-fixed.conf index a5c6c40..6d9e445 100644 --- a/66-bitmap-fixed.conf +++ b/66-bitmap-fixed.conf @@ -1,5 +1,5 @@ - + monospace diff --git a/66-bitmap-lucida-typewriter-opentype.conf b/66-bitmap-lucida-typewriter-opentype.conf new file mode 100644 index 0000000..95c0225 --- /dev/null +++ b/66-bitmap-lucida-typewriter-opentype.conf @@ -0,0 +1,17 @@ + + + + + monospace + + LucidaTypewriter + + + + LucidaTypewriter + + monospace + + + + diff --git a/66-bitmap-lucida-typewriter.conf b/66-bitmap-lucida-typewriter.conf index 90732e0..95c0225 100644 --- a/66-bitmap-lucida-typewriter.conf +++ b/66-bitmap-lucida-typewriter.conf @@ -1,5 +1,5 @@ - + monospace diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/bitmap-fonts.spec b/bitmap-fonts.spec index 34ade35..1e9bf9d 100644 --- a/bitmap-fonts.spec +++ b/bitmap-fonts.spec @@ -1,32 +1,148 @@ +# SPDX-License-Identifier: MIT + +BuildArch: noarch +BuildRequires: bdftopcf fonttosfnt +BuildRequires: make + %global fontname bitmap %global fontconf 66-%{fontname} -%global common_desc \ + +Version: 0.3 +Release: 43%{?dist} +License: GPL-2.0-only AND MIT AND LicenseRef-Lucida + +%global foundry Bitmap + +%global common_description %{expand: The bitmap-fonts package provides a number of bitmap fonts selected\ from the xorg package designed for use locations such as\ terminals. +} -Name: bitmap-fonts -Version: 0.3 -Release: 42%{?dist} -License: GPLv2 and MIT and Lucida -Source0: bitmap-fonts-%{version}.tar.bz2 -Source1: fixfont-3.5.tar.bz2 -Source2: LICENSE -Source3: 66-bitmap-console.conf -Source4: 66-bitmap-fangsongti.conf -Source5: 66-bitmap-fixed.conf -Source6: 66-bitmap-lucida-typewriter.conf -BuildArch: noarch -Summary: Selected set of bitmap fonts -BuildRequires: bdftopcf fonttosfnt -BuildRequires: fontpackages-devel -BuildRequires: python3 -BuildRequires: /usr/bin/ftdump -BuildRequires: make +%global fontfamily1 Lucida Typewriter +%global fontsummary1 Selected CJK bitmap fonts for Anaconda +%global fontlicense1 LicenseRef-Lucida +%global fontlicenses1 LU_LEGALNOTICE +%global fontpkgheader1 %{expand: +Provides: %{name}-cjk = %{version}-%{release} +Conflicts: bitmap-lucida-typewriter-opentype-fonts +} +%global fonts1 lut*.pcf.gz +%global fontconfs1 %{SOURCE17} +%global fontdescription1 %{expand: +%{common_description} +} + +%global fontfamily2 Lucida Typewriter OpenType +%global fontsummary2 Selected CJK bitmap fonts for Anaconda (OpenType version) +%global fontlicense2 LicenseRef-Lucida +%global fontlicenses2 LU_LEGALNOTICE +%global fontpkgheader2 %{expand: +Conflicts: bitmap-lucida-typewriter-fonts +} +%global fonts2 lut*.otb +%global fontconfs2 %{SOURCE18} +%global fontdescription2 %{expand: +%{common_description} +} + +%global fontfamily3 Fangsongti +%global fontsummary3 Selected CJK bitmap fonts for Anaconda +%global fontlicense3 MIT +%global fontlicenses3 LICENSE +%global fontpkgheader3 %{expand: +Provides: %{name}-cjk = %{version}-%{release} +Conflicts: bitmap-fangsongti-opentype-fonts +} +%global fonts3 fangsongti*.pcf.gz +%global fontconfs3 %{SOURCE13} +%global fontdescription3 %{expand: +%{common_description} +} + +%global fontfamily4 Fangsongti OpenType +%global fontsummary4 Selected CJK bitmap fonts for Anaconda (OpenType version) +%global fontlicense4 MIT +%global fontlicenses4 LICENSE +%global fontpkgheader4 %{expand: +Conflicts: bitmap-fangsongti-fonts +} +%global fonts4 fangsongti*.otb +%global fontconfs4 %{SOURCE14} +%global fontdescription4 %{expand: +%{common_description} +} + +%global fontfamily5 Console +%global fontsummary5 Selected set of bitmap fonts +%global fontlicense5 GPL-2.0-only +%global fontlicenses5 COPYING +%global fontpkgheader5 %{expand: +Conflicts: bitmap-console-opentype-fonts +} +%global fonts5 fixfont-3.5/console8x16*.pcf.gz +%global fontconfs5 %{SOURCE11} +%global fontdescription5 %{expand: +%{common_description} +} + +%global fontfamily6 Console OpenType +%global fontsummary6 Selected set of bitmap fonts (OpenType version) +%global fontlicense6 GPL-2.0-only +%global fontlicenses6 COPYING +%global fontpkgheader6 %{expand: +Conflicts: bitmap-console-fonts +} +%global fonts6 fixfont-3.5/console8x16*.otb +%global fontconfs6 %{SOURCE12} +%global fontdescription6 %{expand: +%{common_description} +} + +%global fontfamily7 Fixed +%global fontsummary7 Selected set of bitmap fonts +%global fontlicense7 GPL-2.0-only +%global fontlicenses7 COPYING +%global fontpkgheader7 %{expand: +Conflicts: bitmap-fixed-opentype-fonts +} +%global fonts7 fixfont-3.5/console9*.pcf.gz +%global fontconfs7 %{SOURCE15} +%global fontdescription7 %{expand: +%{common_description} +} + +%global fontfamily8 Fixed OpenType +%global fontsummary8 Selected set of bitmap fonts (OpenType version) +%global fontlicense8 GPL-2.0-only +%global fontlicenses8 COPYING +%global fontpkgheader8 %{expand: +Conflicts: bitmap-fixed-fonts +} +%global fonts8 fixfont-3.5/console9*.otb +%global fontconfs8 %{SOURCE16} +%global fontdescription8 %{expand: +%{common_description} +} +Source0: bitmap-fonts-%{version}.tar.bz2 +Source1: fixfont-3.5.tar.bz2 +Source2: LICENSE +Source3: COPYING +Source11: 66-bitmap-console.conf +Source12: 66-bitmap-console-opentype.conf +Source13: 66-bitmap-fangsongti.conf +Source14: 66-bitmap-fangsongti-opentype.conf +Source15: 66-bitmap-fixed.conf +Source16: 66-bitmap-fixed-opentype.conf +Source17: 66-bitmap-lucida-typewriter.conf +Source18: 66-bitmap-lucida-typewriter-opentype.conf + +Name: bitmap-fonts +Summary: Selected set of bitmap fonts %description -%common_desc +%wordwrap -v common_description %package -n %{fontname}-fonts-compat Summary: Compatibility files of bitmap-font families @@ -60,133 +176,26 @@ Meta-package for installing all font families of opentype bitmap. %files -n %{fontname}-opentype-fonts-compat -%package -n bitmap-lucida-typewriter-fonts -Summary: Selected CJK bitmap fonts for Anaconda -Requires: fontpackages-filesystem -Provides: %{name}-cjk = %{version}-%{release} -License: Lucida -Conflicts: bitmap-lucida-typewriter-opentype-fonts - -%description -n bitmap-lucida-typewriter-fonts -%common_desc - -%_font_pkg -n lucida-typewriter -f %{fontconf}-lucida-typewriter.conf lut*.pcf.gz -%doc LU_LEGALNOTICE - -%package -n bitmap-lucida-typewriter-opentype-fonts -Summary: Selected CJK bitmap fonts for Anaconda (opentype version) -Requires: fontpackages-filesystem -License: Lucida -Conflicts: bitmap-lucida-typewriter-fonts - -%description -n bitmap-lucida-typewriter-opentype-fonts -%common_desc - -%_font_pkg -n lucida-typewriter-opentype -f %{fontconf}-lucida-typewriter.conf lut*.otb -%doc LU_LEGALNOTICE - -%package -n bitmap-fangsongti-fonts -Summary: Selected CJK bitmap fonts for Anaconda -Requires: fontpackages-filesystem -Provides: %{name}-cjk = %{version}-%{release} -License: MIT -Conflicts: bitmap-fangsongti-opentype-fonts - -%description -n %{fontname}-fangsongti-fonts -bitmap-fonts-cjk package contains bitmap fonts used by Anaconda. They are -selected from the xorg packages, and the font encoding are converted from -native encoding to ISO10646. They are only intended to be used in Anaconda. - -%_font_pkg -n fangsongti -f %{fontconf}-fangsongti.conf fangsongti*.pcf.gz -%doc LICENSE - -%package -n bitmap-fangsongti-opentype-fonts -Summary: Selected CJK bitmap fonts for Anaconda (opentype version) -Requires: fontpackages-filesystem -License: MIT -Conflicts: bitmap-fangsongti-fonts - -%description -n %{fontname}-fangsongti-opentype-fonts -%common_desc - -%_font_pkg -n fangsongti-opentype -f %{fontconf}-fangsongti.conf fangsongti*.otb -%doc LICENSE - -%package -n bitmap-console-fonts -Summary: Selected set of bitmap fonts -Requires: fontpackages-filesystem -License: GPLv2 -Conflicts: bitmap-console-opentype-fonts - -%description -n %{fontname}-console-fonts -%common_desc - -%_font_pkg -n console -f %{fontconf}-console.conf console8x16*.pcf.gz - -%package -n bitmap-console-opentype-fonts -Summary: Selected set of bitmap fonts (opentype version) -Requires: fontpackages-filesystem -License: GPLv2 -Conflicts: bitmap-console-fonts - -%description -n %{fontname}-console-opentype-fonts -%common_desc - -%_font_pkg -n console-opentype -f %{fontconf}-console.conf console8x16*.otb - -%package -n bitmap-fixed-fonts -Summary: Selected set of bitmap fonts -Requires: fontpackages-filesystem -License: GPLv2 -Conflicts: bitmap-fixed-opentype-fonts - -%description -n %{fontname}-fixed-fonts -%common_desc - -%_font_pkg -n fixed -f %{fontconf}-fixed.conf console9*.pcf.gz - -%package -n bitmap-fixed-opentype-fonts -Summary: Selected set of bitmap fonts (opentype version) -Requires: fontpackages-filesystem -License: GPLv2 -Conflicts: bitmap-fixed-fonts - -%description -n %{fontname}-fixed-opentype-fonts -%common_desc - -%_font_pkg -n fixed-opentype -f %{fontconf}-fixed.conf console9*.otb +%fontpkg -a %prep %setup -q -a 1 -cp %{SOURCE2} . +cp -p %{SOURCE2} . +cp -p %{SOURCE3} . %build -%{nil} +make all -%install -rm -rf $RPM_BUILD_ROOT - -make install DESTDIR=$RPM_BUILD_ROOT - -pushd fixfont-3.5 -make install DESTDIR=$RPM_BUILD_ROOT -popd - -mv $RPM_BUILD_ROOT/usr/share/fonts/bitmap-fonts %{buildroot}%{_fontdir} - -rm %{buildroot}%{_fontdir}/[0-9]*.pcf -rm %{buildroot}%{_fontdir}/console8x8.pcf -rm README +make -C fixfont-3.5 all # Convert to OpenType Bitmap Font -rm [0-9]*.bdf fixfont-3.5/[0-9]*.bdf +# rm [0-9]*.bdf fixfont-3.5/[0-9]*.bdf for bdf in `ls *.bdf`; do fonttosfnt -b -c -g 2 -m 2 -o ${bdf%%bdf}otb $bdf; done -install -m 0644 -p *.otb %{buildroot}%{_fontdir} pushd fixfont-3.5 for bdf in `ls *.bdf`; @@ -194,39 +203,25 @@ do fonttosfnt -b -c -g 2 -m 2 -o ${bdf%%bdf}otb $bdf; done # For console9x15.otb fonttosfnt -b -c -g 2 -m 2 -o console9x15.otb console9x15.pcf - -install -m 0644 -p *.otb %{buildroot}%{_fontdir} popd -gzip %{buildroot}%{_fontdir}/*.pcf +gzip *.pcf fixfont-3.5/*.pcf -install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ - %{buildroot}%{_fontconfig_confdir} +%fontbuild -a -# Repeat for every font family -install -m 0644 -p %{SOURCE3} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-console.conf +%install +%fontinstall -a -install -m 0644 -p %{SOURCE4} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-fangsongti.conf - -install -m 0644 -p %{SOURCE5} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-fixed.conf - -install -m 0644 -p %{SOURCE6} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-lucida-typewriter.conf - - -for fconf in %{fontconf}-console.conf \ - %{fontconf}-fangsongti.conf \ - %{fontconf}-fixed.conf \ - %{fontconf}-lucida-typewriter.conf ; do - ln -s %{_fontconfig_templatedir}/$fconf \ - %{buildroot}%{_fontconfig_confdir}/$fconf -done +%check +%fontcheck -a +%fontfiles -a %changelog +* Wed May 24 2023 Peng Wu - 0.3-43 +- Update to follow New Fonts Packaging Guidelines +- Migrate to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 0.3-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/tests/tests.yml b/tests/tests.yml index 9509e08..969eddf 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -9,7 +9,7 @@ - bitmap-fangsongti-fonts - bitmap-fixed-fonts - bitmap-lucida-typewriter-fonts - path_prefix: /usr/share/fonts/bitmap + path_prefix: /usr/share/fonts/bitmap-console-fonts coverage: en: families: