pool/xorg-x11-fonts
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 812983 from home:alarrosa:branches:X11:XOrg:legacy

Browse Source 
Don't move fonts from xorg-x11-fonts-core to xorg-x11-fonts

- Add Recommends: xorg-x11-fonts-converted and xorg-x11-fonts-legacy
  so the packages get installed automatically (and users can remove
  any of them or both)

- Add a legacy subpackage that provides the bitmap and Type1 fonts
  under /usr/share/fonts/(75dpi|100dpi|Type1) so the user can
  choose if installing the original fonts (the legacy subpackage),
  the fonts converted to TrueType format (the converted subpackage)
  or both.
- Add some pcf fonts too from /usr/share/fonts/misc to the legacy
  subpackage and make them available as TrueType in the converted
  package (boo#1169444)

OBS-URL: https://build.opensuse.org/request/show/812983
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-fonts?expand=0&rev=103
This commit is contained in:
Antonio Larrosa 2020-06-17 09:01:23 +00:00 committed by Git OBS Bridge
parent 48b09937bc
commit ddc856583e
3 changed files with 245 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
README.converted Normal file
View File

File diff suppressed because one or more lines are too long

19
xorg-x11-fonts.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Jun 9 15:19:43 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
- Add Recommends: xorg-x11-fonts-converted and xorg-x11-fonts-legacy
so the packages get installed automatically (and users can remove
any of them or both)
-------------------------------------------------------------------
Mon Jun 8 14:48:41 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
- Add a legacy subpackage that provides the bitmap and Type1 fonts
under /usr/share/fonts/(75dpi|100dpi|Type1) so the user can
choose if installing the original fonts (the legacy subpackage),
the fonts converted to TrueType format (the converted subpackage)
or both.
- Add some pcf fonts too from /usr/share/fonts/misc to the legacy
subpackage and make them available as TrueType in the converted
package (boo#1169444)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 4 08:29:42 UTC 2020 - Antonio Larrosa <alarrosa@suse.com> Mon May 4 08:29:42 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>

140
xorg-x11-fonts.spec
View File

@ -69,13 +69,14 @@ Source33: http://xorg.freedesktop.org/archive/individual/font/font-adobe-u
Source34: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2 Source34: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
Source35: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2 Source35: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
Source36: http://xorg.freedesktop.org/archive/individual/font/font-alias-1.0.3.tar.bz2 Source36: http://xorg.freedesktop.org/archive/individual/font/font-alias-1.0.3.tar.bz2
Source100: README.converted
%if "%{flavor}" == "converted" %if "%{flavor}" == "converted"
Source1000: https://pwu.fedorapeople.org/fonts/convertbitmap/convertfont.py Source1000: https://pwu.fedorapeople.org/fonts/convertbitmap/convertfont.py
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
BuildRequires: fonttosfnt BuildRequires: fonttosfnt
BuildRequires: ftdump BuildRequires: ftdump
BuildRequires: ttf-converter BuildRequires: ttf-converter
BuildRequires: xorg-x11-fonts BuildRequires: xorg-x11-fonts-legacy
Requires(post): fonts-config Requires(post): fonts-config
Requires(posttrans): fonts-config Requires(posttrans): fonts-config
Requires(postun): fonts-config Requires(postun): fonts-config
@ -93,13 +94,11 @@ BuildRequires: mkfontscale
BuildRequires: font-util BuildRequires: font-util
PreReq: fonts-config PreReq: fonts-config
Requires: %{name}-core Requires: %{name}-core
Provides: xorg-x11-fonts-100dpi Recommends: %{name}-converted
Provides: xorg-x11-fonts-75dpi Recommends: %{name}-legacy
Provides: xorg-x11-fonts-cyrillic Provides: xorg-x11-fonts-cyrillic
Provides: xorg-x11-fonts-scalable Provides: xorg-x11-fonts-scalable
Provides: xorg-x11-fonts-syriac Provides: xorg-x11-fonts-syriac
Obsoletes: xorg-x11-fonts-100dpi
Obsoletes: xorg-x11-fonts-75dpi
Obsoletes: xorg-x11-fonts-cyrillic Obsoletes: xorg-x11-fonts-cyrillic
Obsoletes: xorg-x11-fonts-scalable Obsoletes: xorg-x11-fonts-scalable
Obsoletes: xorg-x11-fonts-syriac Obsoletes: xorg-x11-fonts-syriac
@ -124,13 +123,27 @@ Provides: xorg-x11:/usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz
This package contains the 'fixed' and 'cursor' font required for any X This package contains the 'fixed' and 'cursor' font required for any X
Server. Server.
%package legacy
Summary: Core Fonts for X.Org
Group: System/X11/Fonts
PreReq: fonts-config
Requires: xorg-x11-fonts
Provides: xorg-x11-fonts-100dpi
Provides: xorg-x11-fonts-75dpi
Obsoletes: xorg-x11-fonts-100dpi
Obsoletes: xorg-x11-fonts-75dpi
%description legacy
This package contains the original Type1 and bitmap fonts that are converted
to truetype format in the xorg-x11-fonts-converted package
%prep %prep
%setup -n . -T -D %setup -n . -T -D
%if "%{flavor}" != "converted" %if "%{flavor}" != "converted"
rm -rf $RPM_BUILD_DIR/* rm -rf $RPM_BUILD_DIR/*
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
%else
cp %{SOURCE100} .
%endif %endif
%build %build
@ -164,6 +177,7 @@ cp %{S:1000} .
ttf-converter --input-dir /usr/share/fonts/Type1/ --output-dir generated ttf-converter --input-dir /usr/share/fonts/Type1/ --output-dir generated
cd generated cd generated
python3 ../convertfont.py /usr/share/fonts/75dpi/*.pcf.gz /usr/share/fonts/100dpi/*.pcf.gz python3 ../convertfont.py /usr/share/fonts/75dpi/*.pcf.gz /usr/share/fonts/100dpi/*.pcf.gz
python3 ../convertfont.py /usr/share/fonts/misc/arabic24.pcf.gz /usr/share/fonts/misc/cu[^r]*.pcf.gz /usr/share/fonts/misc/cl*.pcf.gz /usr/share/fonts/misc/[dghjo]*.pcf.gz
# Luxi Mono, Luxi Sans and Luxi Serif are already distributed in ttf format # Luxi Mono, Luxi Sans and Luxi Serif are already distributed in ttf format
rm Luxi*.ttf rm Luxi*.ttf
@ -197,16 +211,41 @@ cd generated
mkdir -p %{buildroot}/%{_datadir}/fonts/truetype mkdir -p %{buildroot}/%{_datadir}/fonts/truetype
cp *.ttf %{buildroot}/%{_datadir}/fonts/truetype cp *.ttf %{buildroot}/%{_datadir}/fonts/truetype
cp Adobe-Courier*.otb %{buildroot}/%{_datadir}/fonts/truetype for filename in Adobe-Courier*.otb \
cp Adobe-Helvetica*.otb %{buildroot}/%{_datadir}/fonts/truetype Adobe-Helvetica*.otb \
cp Adobe-New-Century-Schoolbook*.otb %{buildroot}/%{_datadir}/fonts/truetype Adobe-New-Century-Schoolbook*.otb \
cp Adobe-Symbol.otb %{buildroot}/%{_datadir}/fonts/truetype Adobe-Symbol.otb \
cp Adobe-Times*.otb %{buildroot}/%{_datadir}/fonts/truetype Adobe-Times*.otb \
cp Adobe-Utopia*.otb %{buildroot}/%{_datadir}/fonts/truetype Adobe-Utopia*.otb \
cp B\&H-LucidaBright*.otb %{buildroot}/%{_datadir}/fonts/truetype B\&H-LucidaBright*.otb \
cp B\&H-Lucida-Sans*.otb %{buildroot}/%{_datadir}/fonts/truetype B\&H-Lucida-Sans*.otb \
cp B\&H-LucidaTypewriter-Sans*.otb %{buildroot}/%{_datadir}/fonts/truetype B\&H-LucidaTypewriter-Sans*.otb \
cp Bitstream-Charter*.otb %{buildroot}/%{_datadir}/fonts/truetype Bitstream-Charter*.otb \
Arabic-Newspaper.otb \
MUTT-ClearlyU-Alternate-Glyphs-Wide.otb \
MUTT-ClearlyU-Arabic-Extra.otb \
MUTT-ClearlyU-Devangari-Extra.otb \
MUTT-ClearlyU-Ligature-Wide.otb \
MUTT-ClearlyU-PUA.otb \
MUTT-ClearlyU-Wide.otb \
MUTT-ClearlyU-Devanagari.otb \
Schumacher-Clean-Bold.otb \
Schumacher-Clean-Wide-Bold.otb \
Schumacher-Clean-Italic.otb \
Schumacher-Clean-Wide-Italic.otb \
Schumacher-Clean.otb \
Schumacher-Clean-Wide.otb \
ISAS-Fangsong-ti-Wide.otb \
ISAS-Song-ti-Wide.otb \
Daewoo-Gothic-Wide.otb \
Daewoo-Mincho-Wide.otb \
JIS-Fixed-Wide.otb \
Sun-OPEN-LOOK-cursor-Wide.otb \
Sun-OPEN-LOOK-glyph-Wide.otb \
Sun-OPEN-LOOK-glyph.otb ; do
cp "$filename" %{buildroot}/%{_datadir}/fonts/truetype
done
%endif %endif
%clean %clean
@ -217,28 +256,17 @@ rm -rf "$RPM_BUILD_ROOT"
%if "%{flavor}" != "converted" %if "%{flavor}" != "converted"
%reconfigure_fonts_scriptlets -n xorg-x11-fonts-core %reconfigure_fonts_scriptlets -n xorg-x11-fonts-core
%reconfigure_fonts_scriptlets -n xorg-x11-fonts-legacy
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir /usr/share/fonts/100dpi
%dir /usr/share/fonts/Type1 %dir /usr/share/fonts/Type1
%dir /usr/share/fonts/cyrillic %dir /usr/share/fonts/cyrillic
%dir /usr/share/fonts/truetype %dir /usr/share/fonts/truetype
%ghost /usr/share/fonts/100dpi/encodings.dir
%ghost /usr/share/fonts/100dpi/fonts.dir
%ghost /usr/share/fonts/100dpi/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/100dpi/.fonts-config-timestamp
/usr/share/fonts/100dpi/fonts.alias
/usr/share/fonts/100dpi/*.pcf.gz
/usr/share/fonts/75dpi/fonts.alias
/usr/share/fonts/75dpi/*-ISO8859-*.pcf.gz
%ghost /usr/share/fonts/Type1/encodings.dir %ghost /usr/share/fonts/Type1/encodings.dir
%ghost /usr/share/fonts/Type1/fonts.dir %ghost /usr/share/fonts/Type1/fonts.dir
%ghost /usr/share/fonts/Type1/fonts.scale %ghost /usr/share/fonts/Type1/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/Type1/.fonts-config-timestamp %ghost %verify(not mode) /usr/share/fonts/Type1/.fonts-config-timestamp
/usr/share/fonts/Type1/*.afm
/usr/share/fonts/Type1/*.pfa
/usr/share/fonts/Type1/*.pfb
%ghost /usr/share/fonts/cyrillic/encodings.dir %ghost /usr/share/fonts/cyrillic/encodings.dir
%ghost /usr/share/fonts/cyrillic/fonts.dir %ghost /usr/share/fonts/cyrillic/fonts.dir
%ghost /usr/share/fonts/cyrillic/fonts.scale %ghost /usr/share/fonts/cyrillic/fonts.scale
@ -252,14 +280,9 @@ rm -rf "$RPM_BUILD_ROOT"
/usr/share/fonts/truetype/*.otf /usr/share/fonts/truetype/*.otf
/usr/share/fonts/truetype/*.ttf /usr/share/fonts/truetype/*.ttf
%files core -f files.%{name}-core %files core
%defattr(-,root,root) %defattr(-,root,root)
%dir /usr/share/fonts/misc %dir /usr/share/fonts/misc
%dir /usr/share/fonts/75dpi
%ghost /usr/share/fonts/75dpi/encodings.dir
%ghost /usr/share/fonts/75dpi/fonts.dir
%ghost /usr/share/fonts/75dpi/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/75dpi/.fonts-config-timestamp
%dir /usr/share/fonts/encodings %dir /usr/share/fonts/encodings
%dir /usr/share/fonts/encodings/large %dir /usr/share/fonts/encodings/large
/usr/share/fonts/encodings/*.enc.gz /usr/share/fonts/encodings/*.enc.gz
@ -269,12 +292,39 @@ rm -rf "$RPM_BUILD_ROOT"
%ghost /usr/share/fonts/misc/fonts.scale %ghost /usr/share/fonts/misc/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/misc/.fonts-config-timestamp %ghost %verify(not mode) /usr/share/fonts/misc/.fonts-config-timestamp
/usr/share/fonts/misc/fonts.alias /usr/share/fonts/misc/fonts.alias
/usr/share/fonts/misc/*.pcf.gz /usr/share/fonts/misc/[1-9k]*.pcf.gz
/usr/share/fonts/misc/cursor.pcf.gz
/usr/share/fonts/misc/micro.pcf.gz
/usr/share/fonts/misc/nil2.pcf.gz
%files legacy -f files.%{name}-core
%dir /usr/share/fonts/75dpi
%ghost /usr/share/fonts/75dpi/encodings.dir
%ghost /usr/share/fonts/75dpi/fonts.dir
%ghost /usr/share/fonts/75dpi/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/75dpi/.fonts-config-timestamp
%dir /usr/share/fonts/100dpi
%ghost /usr/share/fonts/100dpi/encodings.dir
%ghost /usr/share/fonts/100dpi/fonts.dir
%ghost /usr/share/fonts/100dpi/fonts.scale
%ghost %verify(not mode) /usr/share/fonts/100dpi/.fonts-config-timestamp
/usr/share/fonts/75dpi/fonts.alias
/usr/share/fonts/75dpi/*-ISO8859-*.pcf.gz
/usr/share/fonts/100dpi/fonts.alias
/usr/share/fonts/100dpi/*.pcf.gz
/usr/share/fonts/misc/arabic24.pcf.gz
/usr/share/fonts/misc/cu[^r]*.pcf.gz
/usr/share/fonts/misc/cl*.pcf.gz
/usr/share/fonts/misc/[dghjo]*.pcf.gz
/usr/share/fonts/Type1/*.afm
/usr/share/fonts/Type1/*.pfa
/usr/share/fonts/Type1/*.pfb
%else %else
# "%%{flavor}" == "converted" # "%%{flavor}" == "converted"
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc README.converted
%dir %{_datadir}/fonts/truetype %dir %{_datadir}/fonts/truetype
%{_datadir}/fonts/truetype/CharterBT-*.ttf %{_datadir}/fonts/truetype/CharterBT-*.ttf
%{_datadir}/fonts/truetype/Courier10PitchBT-*.ttf %{_datadir}/fonts/truetype/Courier10PitchBT-*.ttf
@ -293,6 +343,28 @@ rm -rf "$RPM_BUILD_ROOT"
%{_datadir}/fonts/truetype/B&H-Lucida-Sans*.otb %{_datadir}/fonts/truetype/B&H-Lucida-Sans*.otb
%{_datadir}/fonts/truetype/B&H-LucidaTypewriter-Sans*.otb %{_datadir}/fonts/truetype/B&H-LucidaTypewriter-Sans*.otb
%{_datadir}/fonts/truetype/Bitstream-Charter*.otb %{_datadir}/fonts/truetype/Bitstream-Charter*.otb
%{_datadir}/fonts/truetype/Arabic-Newspaper.otb
%{_datadir}/fonts/truetype/MUTT-ClearlyU-Alternate-Glyphs-Wide.otb
%{_datadir}/fonts/truetype/MUTT-ClearlyU-Arabic-Extra.otb
%{_datadir}/fonts/truetype/MUTT-ClearlyU-Devangari-Extra.otb
%{_datadir}/fonts/truetype/MUTT-ClearlyU-Ligature-Wide.otb
%{_datadir}/fonts/truetype/MUTT-ClearlyU-PUA.otb
%{_datadir}/fonts/truetype/MUTT-ClearlyU-Wide.otb
%{_datadir}/fonts/truetype/MUTT-ClearlyU-Devanagari.otb
%{_datadir}/fonts/truetype/Schumacher-Clean-Bold.otb
%{_datadir}/fonts/truetype/Schumacher-Clean-Wide-Bold.otb
%{_datadir}/fonts/truetype/Schumacher-Clean-Italic.otb
%{_datadir}/fonts/truetype/Schumacher-Clean-Wide-Italic.otb
%{_datadir}/fonts/truetype/Schumacher-Clean.otb
%{_datadir}/fonts/truetype/Schumacher-Clean-Wide.otb
%{_datadir}/fonts/truetype/ISAS-Fangsong-ti-Wide.otb
%{_datadir}/fonts/truetype/ISAS-Song-ti-Wide.otb
%{_datadir}/fonts/truetype/Daewoo-Gothic-Wide.otb
%{_datadir}/fonts/truetype/Daewoo-Mincho-Wide.otb
%{_datadir}/fonts/truetype/JIS-Fixed-Wide.otb
%{_datadir}/fonts/truetype/Sun-OPEN-LOOK-cursor-Wide.otb
%{_datadir}/fonts/truetype/Sun-OPEN-LOOK-glyph-Wide.otb
%{_datadir}/fonts/truetype/Sun-OPEN-LOOK-glyph.otb
%endif %endif
%changelog %changelog