Compare commits

...

No commits in common. "c8s" and "c9-beta" have entirely different histories.
c8s ... c9-beta

1 changed files with 137 additions and 17 deletions

View File

@ -7,7 +7,7 @@ terminals.
Name: bitmap-fonts Name: bitmap-fonts
Version: 0.3 Version: 0.3
Release: 28%{?dist} Release: 40%{?dist}
License: GPLv2 and MIT and Lucida License: GPLv2 and MIT and Lucida
Source0: bitmap-fonts-%{version}.tar.bz2 Source0: bitmap-fonts-%{version}.tar.bz2
Source1: fixfont-3.5.tar.bz2 Source1: fixfont-3.5.tar.bz2
@ -16,27 +16,28 @@ Source3: 66-bitmap-console.conf
Source4: 66-bitmap-fangsongti.conf Source4: 66-bitmap-fangsongti.conf
Source5: 66-bitmap-fixed.conf Source5: 66-bitmap-fixed.conf
Source6: 66-bitmap-lucida-typewriter.conf Source6: 66-bitmap-lucida-typewriter.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
Group: User Interface/X
Summary: Selected set of bitmap fonts Summary: Selected set of bitmap fonts
BuildRequires: xorg-x11-font-utils BuildRequires: bdftopcf fonttosfnt
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
BuildRequires: python3
BuildRequires: /usr/bin/ftdump
BuildRequires: make
%description %description
%common_desc %common_desc
%package -n %{fontname}-fonts-compat %package -n %{fontname}-fonts-compat
Summary: Compatibility files of bitmap-font families Summary: Compatibility files of bitmap-font families
Group: User Interface/X Provides: bitmap-fonts = %{version}-%{release}
Provides: bitmap-fonts = %{version}-%{release}
Requires: %{fontname}-lucida-typewriter-fonts = %{version}-%{release} Requires: %{fontname}-lucida-typewriter-fonts = %{version}-%{release}
Requires: %{fontname}-fangsongti-fonts = %{version}-%{release} Requires: %{fontname}-fangsongti-fonts = %{version}-%{release}
Requires: %{fontname}-console-fonts = %{version}-%{release} Requires: %{fontname}-console-fonts = %{version}-%{release}
Requires: %{fontname}-fixed-fonts = %{version}-%{release} Requires: %{fontname}-fixed-fonts = %{version}-%{release}
Requires: ucs-miscfixed-fonts Requires: ucs-miscfixed-fonts
Obsoletes: bitmap-fonts < %{version}-%{release} Obsoletes: bitmap-fonts < %{version}-%{release}
Conflicts: %{fontname}-opentype-fonts-compat
%description -n %{fontname}-fonts-compat %description -n %{fontname}-fonts-compat
%common_desc %common_desc
@ -44,16 +45,44 @@ Meta-package for installing all font families of bitmap.
%files -n %{fontname}-fonts-compat %files -n %{fontname}-fonts-compat
%package -n %{fontname}-opentype-fonts-compat
Summary: Compatibility files of bitmap-font families (opentype version)
Requires: %{fontname}-lucida-typewriter-opentype-fonts = %{version}-%{release}
Requires: %{fontname}-fangsongti-opentype-fonts = %{version}-%{release}
Requires: %{fontname}-console-opentype-fonts = %{version}-%{release}
Requires: %{fontname}-fixed-opentype-fonts = %{version}-%{release}
Requires: ucs-miscfixed-opentype-fonts
Conflicts: %{fontname}-fonts-compat
%description -n %{fontname}-opentype-fonts-compat
%common_desc
Meta-package for installing all font families of opentype bitmap.
%files -n %{fontname}-opentype-fonts-compat
%package -n bitmap-lucida-typewriter-fonts %package -n bitmap-lucida-typewriter-fonts
Summary: Selected CJK bitmap fonts for Anaconda Summary: Selected CJK bitmap fonts for Anaconda
Requires: fontpackages-filesystem Requires: fontpackages-filesystem
Provides: %{name}-cjk = %{version}-%{release} Provides: %{name}-cjk = %{version}-%{release}
License: Lucida License: Lucida
Conflicts: bitmap-lucida-typewriter-opentype-fonts
%description -n bitmap-lucida-typewriter-fonts %description -n bitmap-lucida-typewriter-fonts
%common_desc %common_desc
%_font_pkg -n lucida-typewriter -f %{fontconf}-lucida-typewriter.conf lut* %_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 %doc LU_LEGALNOTICE
%package -n bitmap-fangsongti-fonts %package -n bitmap-fangsongti-fonts
@ -61,35 +90,72 @@ Summary: Selected CJK bitmap fonts for Anaconda
Requires: fontpackages-filesystem Requires: fontpackages-filesystem
Provides: %{name}-cjk = %{version}-%{release} Provides: %{name}-cjk = %{version}-%{release}
License: MIT License: MIT
Conflicts: bitmap-fangsongti-opentype-fonts
%description -n %{fontname}-fangsongti-fonts %description -n %{fontname}-fangsongti-fonts
bitmap-fonts-cjk package contains bitmap fonts used by Anaconda. They are bitmap-fonts-cjk package contains bitmap fonts used by Anaconda. They are
selected from the xorg packages, and the font encoding are converted from 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. native encoding to ISO10646. They are only intended to be used in Anaconda.
%_font_pkg -n fangsongti -f %{fontconf}-fangsongti.conf fangsongti* %_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 %doc LICENSE
%package -n bitmap-console-fonts %package -n bitmap-console-fonts
Summary: Selected set of bitmap fonts Summary: Selected set of bitmap fonts
Requires: fontpackages-filesystem Requires: fontpackages-filesystem
License: GPLv2 License: GPLv2
Conflicts: bitmap-console-opentype-fonts
%description -n %{fontname}-console-fonts %description -n %{fontname}-console-fonts
%common_desc %common_desc
%_font_pkg -n console -f %{fontconf}-console.conf console8x16* %_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 %package -n bitmap-fixed-fonts
Summary: Selected set of bitmap fonts Summary: Selected set of bitmap fonts
Requires: fontpackages-filesystem Requires: fontpackages-filesystem
License: GPLv2 License: GPLv2
Conflicts: bitmap-fixed-opentype-fonts
%description -n %{fontname}-fixed-fonts %description -n %{fontname}-fixed-fonts
%common_desc %common_desc
%_font_pkg -n fixed -f %{fontconf}-fixed.conf console9* %_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
%prep %prep
%setup -q -a 1 %setup -q -a 1
@ -104,9 +170,9 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
cd fixfont-3.5 pushd fixfont-3.5
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
popd
mv $RPM_BUILD_ROOT/usr/share/fonts/bitmap-fonts %{buildroot}%{_fontdir} mv $RPM_BUILD_ROOT/usr/share/fonts/bitmap-fonts %{buildroot}%{_fontdir}
@ -114,6 +180,24 @@ rm %{buildroot}%{_fontdir}/[0-9]*.pcf
rm %{buildroot}%{_fontdir}/console8x8.pcf rm %{buildroot}%{_fontdir}/console8x8.pcf
rm README rm README
# Convert to OpenType Bitmap Font
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`;
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 %{buildroot}%{_fontdir}/*.pcf
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
@ -142,10 +226,46 @@ for fconf in %{fontconf}-console.conf \
done done
%clean
rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.3-40
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.3-39
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Mar 02 2021 Parag Nemade <pnemade AT redhat DOT com> - 0.3-38
- Resolves: rhbz#1933563 - Don't BuildRequires xorg-x11-font-utils
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 29 2020 Peng Wu <pwu@redhat.com> - 0.3-36
- Rebuilt with fonttosfnt 1.2.1
* Fri Sep 4 2020 Peng Wu <pwu@redhat.com> - 0.3-35
- Use BDF fonts for OpenType conversion
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Feb 6 2020 Peng Wu <pwu@redhat.com> - 0.3-33
- Provide OpenType Bitmap fonts
- Use bitmapfonts2otb.py to combine bitmap fonts
- Add bitmap-*-opentype-fonts sub packages
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3-28 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3-28
- Escape macros in %%changelog - Escape macros in %%changelog