From 74e2fc31eca4bda4a14c7519386b4094f4b6c931 Mon Sep 17 00:00:00 2001 From: Pravin Satpute Date: Nov 18 2009 14:22:19 +0000 Subject: - removed console8x8.pcf from console sub-package --- diff --git a/66-bitmap-console.conf b/66-bitmap-console.conf new file mode 100644 index 0000000..5bab5e0 --- /dev/null +++ b/66-bitmap-console.conf @@ -0,0 +1,17 @@ + + + + + monospace + + Console + + + + Console + + monospace + + + + diff --git a/66-bitmap-fangsongti.conf b/66-bitmap-fangsongti.conf new file mode 100644 index 0000000..4100bff --- /dev/null +++ b/66-bitmap-fangsongti.conf @@ -0,0 +1,17 @@ + + + + + monospace + + Fangsong ti + + + + Fangsong ti + + monospace + + + + diff --git a/66-bitmap-fixed.conf b/66-bitmap-fixed.conf new file mode 100644 index 0000000..a5c6c40 --- /dev/null +++ b/66-bitmap-fixed.conf @@ -0,0 +1,17 @@ + + + + + monospace + + Fixed + + + + Fixed + + monospace + + + + diff --git a/66-bitmap-lucida-typewriter.conf b/66-bitmap-lucida-typewriter.conf new file mode 100644 index 0000000..90732e0 --- /dev/null +++ b/66-bitmap-lucida-typewriter.conf @@ -0,0 +1,17 @@ + + + + + monospace + + LucidaTypewriter + + + + LucidaTypewriter + + monospace + + + + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f81d171 --- /dev/null +++ b/LICENSE @@ -0,0 +1,58 @@ + This font is a merge of: + + -ISAS-Fangsong ti-Medium-R-Normal--24-240-72-72-c-240-ISO10646-1 + -Sony-Fixed-Medium-R-Normal--24-170-100-100-C-120-ISO8859-1 + +Copyright (C) 1988 The Institute of Software, Academia Sinica. + +Correspondence Address: P.O.Box 8718, Beijing, China 100080. + +Permission to use, copy, modify, and distribute this software and +its documentation for any purpose and without fee is hereby granted, +provided that the above copyright notices appear in all copies and +that both those copyright notices and this permission notice appear +in supporting documentation, and that the name of "the Institute of +Software, Academia Sinica" not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. The Institute of Software, Academia Sinica, +makes no representations about the suitability of this software +for any purpose. It is provided "as is" without express or +implied warranty. + +THE INSTITUTE OF SOFTWARE, ACADEMIA SINICA, DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE INSTITUTE OF +SOFTWARE, ACADEMIA SINICA, BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +This is a hanzi guobiao (GB) code 24x24 song ti font. +GB stands for the National Standard GB2312-80 of +the People's Republic of China. + + +Copyright 1989 by Sony Corp. + +Permission to use, copy, modify, and distribute this software and +its documentation for any purpose and without fee is hereby granted, +provided that the above copyright notices appear in all copies and +that both those copyright notices and this permission notice appear +in supporting documentation, and that the name of Sony Corp. +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. Sony +Corp. makes no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +SONY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL SONY BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + diff --git a/bitmap-fonts.spec b/bitmap-fonts.spec index 95a10f8..c2da53c 100644 --- a/bitmap-fonts.spec +++ b/bitmap-fonts.spec @@ -1,53 +1,83 @@ -#%global fontname bitmap -%define common_desc \ +%global fontname bitmap +%global fontconf 66-%{fontname} +%global common_desc \ 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: 9%{?dist} -License: Lucida and MIT and Public Domain +Release: 14%{?dist} +License: 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Group: User Interface/X Summary: Selected set of bitmap fonts -Requires(pre): fontconfig +Requires: fontpackages-filesystem BuildRequires: xorg-x11-font-utils BuildRequires: fontpackages-devel + %description %common_desc -%package common -Summary: Common files for bitmap-fonts +%package -n bitmap-lucida-typewriter-fonts +Summary: Selected CJK bitmap fonts for Anaconda Requires: fontpackages-filesystem +Provides: %{name}-cjk = %{version}-%{release} +License: MIT -%description common +%description -n bitmap-lucida-typewriter-fonts %common_desc -This package consists of files used by other %{name} packages. - -%_font_pkg lut* con* [0-9]* +%_font_pkg -n lucida-typewriter -f %{fontconf}-lucida-typewriter.conf lut* +%doc LU_LEGALNOTICE -%package -n bitmap-cjk-fonts +%package -n bitmap-fangsongti-fonts Summary: Selected CJK bitmap fonts for Anaconda -Group: Applications/System -Requires(pre): fontconfig -Requires: %{name}-common = %{version}-%{release} +Requires: fontpackages-filesystem Provides: %{name}-cjk = %{version}-%{release} +License: MIT -%description -n %{fontname}-cjk-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 cjk fangsongti* +%_font_pkg -n fangsongti -f %{fontconf}-fangsongti.conf fangsongti* +%doc LICENSE + +%package -n bitmap-console-fonts +Summary: Selected set of bitmap fonts +Requires: fontpackages-filesystem +License: GPLv2 + +%description -n %{fontname}-console-fonts +%common_desc + +%_font_pkg -n console -f %{fontconf}-console.conf console8x16* + + +%package -n bitmap-fixed-fonts +Summary: Selected set of bitmap fonts +Requires: fontpackages-filesystem +License: GPLv2 + +%description -n %{fontname}-fixed-fonts +%common_desc + +%_font_pkg -n fixed -f %{fontconf}-fixed.conf console9* %prep %setup -q -a 1 +cp %{SOURCE2} . %install @@ -61,22 +91,61 @@ make install DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/usr/share/fonts/bitmap-fonts %{buildroot}%{_fontdir} -#install -m 0755 -d %{buildroot}%{_fontdir} +rm %{buildroot}%{_fontdir}/[0-9]*.pcf +rm %{buildroot}%{_fontdir}/console8x8.pcf +rm README + +gzip %{buildroot}%{_fontdir}/*.pcf + +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} + +# Repeat for every font family +install -m 0644 -p %{SOURCE3} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-console.conf + +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 -# %%ghost the fonts.cache-1 file -#touch $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/fonts.cache-1 %clean rm -rf $RPM_BUILD_ROOT -%files common -%defattr(-,root,root) -%doc README LU_LEGALNOTICE - %changelog -* Wed Sep 30 2009 Pravin Satpute - 0.3-9 +* Wed Nov 18 2009 Pravin Satpute - 0.3-14 +- removed console8x8.pcf from console sub-package + +* Fri Oct 09 2009 Pravin Satpute - 0.3-13 +- added lucida-typewriter and fixed subpackage +- removed common subpackage +- added conf file for each subpackage + +* Fri Oct 09 2009 Pravin Satpute - 0.3-12 +- updates license for each subpackage + +* Thu Sep 17 2009 Pravin Satpute - 0.3-11 +- second update as per merge review comment, bug 225617 + +* Thu Sep 17 2009 Pravin Satpute - 0.3-10 +- updating as per merge review comment + +* Thu Sep 17 2009 Pravin Satpute - 0.3-9 - updating as per new packaging guidelines -- bugfix 481068 * Fri Jul 24 2009 Fedora Release Engineering - 0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild