rpms/un-extra-fonts/F-13 import.log, 1.1, 1.2 un-extra-fonts.spec, 1.3, 1.4
Daiki Ueno
ueno at fedoraproject.org
Tue Apr 27 08:17:51 UTC 2010
Author: ueno
Update of /cvs/pkgs/rpms/un-extra-fonts/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12244/F-13
Modified Files:
import.log un-extra-fonts.spec
Log Message:
convert to new font packaging guidelines (#477475)
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/un-extra-fonts/F-13/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 15 Oct 2008 17:14:18 -0000 1.1
+++ import.log 27 Apr 2010 08:17:50 -0000 1.2
@@ -1 +1,2 @@
un-extra-fonts-1_0_2-0_7_080608_fc9:HEAD:un-extra-fonts-1.0.2-0.7.080608.fc9.src.rpm:1224090937
+un-extra-fonts-1_0_2-0_10_080608_fc13:F-13:un-extra-fonts-1.0.2-0.10.080608.fc13.src.rpm:1272356257
Index: un-extra-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/un-extra-fonts/F-13/un-extra-fonts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- un-extra-fonts.spec 27 Jul 2009 06:30:42 -0000 1.3
+++ un-extra-fonts.spec 27 Apr 2010 08:17:51 -0000 1.4
@@ -1,8 +1,7 @@
-%define fontname un-extra
-%define fontdir %{_datadir}/fonts/%{fontname}/
-%define fontconfdir %{_sysconfdir}/fonts/conf.d/
+%global fontname un-extra
+%global fontconf 66-%{fontname}
-%define archivename un-fonts-extra
+%global archivename un-fonts-extra
%define alphatag 080608
%define common_desc_en \
@@ -37,7 +36,7 @@ Extra 모음 \
Name: %{fontname}-fonts
Version: 1.0.2
-Release: 0.9.%{alphatag}%{?dist}
+Release: 0.10.%{alphatag}%{?dist}
Summary: Un Extra family of Korean TrueType fonts
Summary(ko): 한글 은글꼴 Extra 모음
@@ -60,35 +59,27 @@ Source12: %{name}-yetgul-fontconfig.con
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+BuildRequires: fontpackages-devel
+
+
+%package common
+Summary: Common files for the Un Extra font set
+Requires: fontpackages-filesystem
+
+%files common
+%defattr(0644,root,root,0755)
+%doc COPYING README
%define un_subpkg() \
-%package %1 \
+%package -n %{fontname}-%{1}-fonts \
Summary: Un Extra fonts - %(echo %2) \
Summary(ko): 한글 은글꼴 Extra 모음 - %(echo %3) \
Group: User Interface/X \
+Requires: %{name}-common = %{version}-%{release} \
+Obsoletes: %{fontname}-fonts-%{1} < 1.0.2-0.10 \
\
\
-%post %1 \
-if [ -x %{_bindir}/fc-cache ]; then \
- %{_bindir}/fc-cache %{fontdir} || : \
-fi \
-\
-\
-%postun %1 \
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \
- %{_bindir}/fc-cache %{fontdir} || : \
-fi\
-\
-\
-%files %1 \
-%defattr(0644,root,root,0755) \
-%doc COPYING README \
-\
-%config(noreplace) %{fontconfdir}66-%{fontname}-%(echo %1).conf \
-\
-%dir %{fontdir} \
-%{fontdir}%(echo %2)*.ttf
%un_subpkg bom UnBom 은봄
%un_subpkg jamobatang UnJamoBatang 은자모바탕
@@ -109,127 +100,146 @@ fi\
%description -l ko
%common_desc_ko
-%description bom
+%description common
+%common_desc_en
+
+This package consists of files used by other %{name} packages.
+
+%description -n %{fontname}-bom-fonts
%common_desc_en
This package includes UnBom, a decorative font.
-%description -l ko bom
+%description -l ko -n %{fontname}-bom-fonts
%common_desc_ko
이 패키지에는 은봄글꼴이 포함되어 있습니다.
-%description jamobatang
+%description -n %{fontname}-jamobatang-fonts
%common_desc_en
This package includes the UnJamoBatang font.
-%description -l ko jamobatang
+%description -l ko -n %{fontname}-jamobatang-fonts
%common_desc_ko
이 패키지에는 은자모바탕글꼴이 포함되어 있습니다.
-%description jamodotum
+%description -n %{fontname}-jamodotum-fonts
%common_desc_en
This package includes the UNJamoDotum font.
-%description -l ko jamodotum
+%description -l ko -n %{fontname}-jamodotum-fonts
%common_desc_ko
이 패키지에는 은자모돋음글꼴이 포함되어 있습니다.
-%description jamonovel
+%description -n %{fontname}-jamonovel-fonts
%common_desc_en
This package includes the UNJamoNovel font.
-%description -l ko jamonovel
+%description -l ko -n %{fontname}-jamonovel-fonts
%common_desc_ko
이 패키지에는 은자모노벨글꼴이 포함되어 있습니다.
-%description jamosora
+%description -n %{fontname}-jamosora-fonts
%common_desc_en
This package includes the UNJamoSora font.
-%description -l ko jamosora
+%description -l ko -n %{fontname}-jamosora-fonts
%common_desc_ko
이 패키지에는 은자모소라글꼴이 포함되어 있습니다.
-%description pen
+%description -n %{fontname}-pen-fonts
%common_desc_en
This package includes UnPen, a script font.
-%description -l ko pen
+%description -l ko -n %{fontname}-pen-fonts
%common_desc_ko
이 패키지에는 은펜글꼴이 포함되어 있습니다.
-%description penheulim
+%description -n %{fontname}-penheulim-fonts
%common_desc_en
This package includes UnPenheulim, a script font.
-%description -l ko penheulim
+%description -l ko -n %{fontname}-penheulim-fonts
%common_desc_ko
이 패키지에는 은펜흘림글꼴이 포함되어 있습니다.
-%description pilgia
+%description -n %{fontname}-pilgia-fonts
%common_desc_en
This package includes UnPilgia, a script font.
-%description -l ko pilgia
+%description -l ko -n %{fontname}-pilgia-fonts
%common_desc_ko
이 패키지에는 은필기a글꼴이 포함되어 있습니다.
-%description shinmun
+%description -n %{fontname}-shinmun-fonts
%common_desc_en
This package includes the UnShinmun font.
-%description -l ko shinmun
+%description -l ko -n %{fontname}-shinmun-fonts
%common_desc_ko
이 패키지에는 은신문글꼴이 포함되어 있습니다.
-%description taza
+%description -n %{fontname}-taza-fonts
%common_desc_en
This package includes UnTaza, a typewriter font.
-%description -l ko taza
+%description -l ko -n %{fontname}-taza-fonts
%common_desc_ko
이 패키지에는 은타자글꼴이 포함되어 있습니다.
-%description vada
+%description -n %{fontname}-vada-fonts
%common_desc_en
This package includes the UnVada font.
-%description -l ko vada
+%description -l ko -n %{fontname}-vada-fonts
%common_desc_ko
이 패키지에는 은바다글꼴이 포함되어 있습니다.
-%description yetgul
+%description -n %{fontname}-yetgul-fonts
%common_desc_en
This package includes UnYetgul, an old Korean printing font.
-%description -l ko yetgul
+%description -l ko -n %{fontname}-yetgul-fonts
%common_desc_ko
이 패키지에는 은옛글글꼴이 포함되어 있습니다.
+%_font_pkg -n bom -f %{fontconf}-bom.conf UnBom.ttf
+%_font_pkg -n jamobatang -f %{fontconf}-jamobatang.conf UnJamoBatang.ttf
+%_font_pkg -n jamodotum -f %{fontconf}-jamodotum.conf UnJamoDotum.ttf
+%_font_pkg -n jamonovel -f %{fontconf}-jamonovel.conf UnJamoNovel.ttf
+%_font_pkg -n jamosora -f %{fontconf}-jamosora.conf UnJamoSora.ttf
+%_font_pkg -n pen -f %{fontconf}-pen.conf UnPen.ttf
+%_font_pkg -n penheulim -f %{fontconf}-penheulim.conf UnPenheulim.ttf
+%_font_pkg -n pilgia -f %{fontconf}-pilgia.conf UnPilgia.ttf
+%_font_pkg -n shinmun -f %{fontconf}-shinmun.conf UnShinmun.ttf
+%_font_pkg -n taza -f %{fontconf}-taza.conf UnTaza.ttf
+%_font_pkg -n vada -f %{fontconf}-vada.conf UnVada.ttf
+%_font_pkg -n yetgul -f %{fontconf}-yetgul.conf UnYetgul.ttf
+
+
%prep
%setup -q -n un-fonts
@@ -240,34 +250,52 @@ This package includes UnYetgul, an old K
%install
rm -rf %{buildroot}
-install -dm 0755 -d %{buildroot}%{fontdir}
-install -pm 0644 -p *.ttf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
-install -dm 0755 -d %{buildroot}%{fontconfdir}
-install -pm 0644 -p %{SOURCE1}\
- %{buildroot}%{fontconfdir}66-%{fontname}-bom.conf
-install -pm 0644 -p %{SOURCE2}\
- %{buildroot}%{fontconfdir}66-%{fontname}-jamobatang.conf
-install -pm 0644 -p %{SOURCE3}\
- %{buildroot}%{fontconfdir}66-%{fontname}-jamodotum.conf
-install -pm 0644 -p %{SOURCE4}\
- %{buildroot}%{fontconfdir}66-%{fontname}-jamonovel.conf
-install -pm 0644 -p %{SOURCE5}\
- %{buildroot}%{fontconfdir}66-%{fontname}-jamosora.conf
-install -pm 0644 -p %{SOURCE6}\
- %{buildroot}%{fontconfdir}66-%{fontname}-pen.conf
-install -pm 0644 -p %{SOURCE7}\
- %{buildroot}%{fontconfdir}66-%{fontname}-penheulim.conf
-install -pm 0644 -p %{SOURCE8}\
- %{buildroot}%{fontconfdir}66-%{fontname}-pilgia.conf
-install -pm 0644 -p %{SOURCE9}\
- %{buildroot}%{fontconfdir}66-%{fontname}-shinmun.conf
-install -pm 0644 -p %{SOURCE10}\
- %{buildroot}%{fontconfdir}66-%{fontname}-taza.conf
-install -pm 0644 -p %{SOURCE11}\
- %{buildroot}%{fontconfdir}66-%{fontname}-vada.conf
-install -pm 0644 -p %{SOURCE12}\
- %{buildroot}%{fontconfdir}66-%{fontname}-yetgul.conf
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+ %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE1} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-bom.conf
+install -m 0644 -p %{SOURCE2} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-jamobatang.conf
+install -m 0644 -p %{SOURCE3} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-jamodotum.conf
+install -m 0644 -p %{SOURCE4} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-jamonovel.conf
+install -m 0644 -p %{SOURCE5} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-jamosora.conf
+install -m 0644 -p %{SOURCE6} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pen.conf
+install -m 0644 -p %{SOURCE7} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-penheulim.conf
+install -m 0644 -p %{SOURCE8} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pilgia.conf
+install -m 0644 -p %{SOURCE9} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-shinmun.conf
+install -m 0644 -p %{SOURCE10} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-taza.conf
+install -m 0644 -p %{SOURCE11} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-vada.conf
+install -m 0644 -p %{SOURCE12} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-yetgul.conf
+
+for fconf in %{fontconf}-bom.conf \
+ %{fontconf}-jamobatang.conf \
+ %{fontconf}-jamodotum.conf \
+ %{fontconf}-jamonovel.conf \
+ %{fontconf}-jamosora.conf \
+ %{fontconf}-pen.conf \
+ %{fontconf}-penheulim.conf \
+ %{fontconf}-pilgia.conf \
+ %{fontconf}-shinmun.conf \
+ %{fontconf}-taza.conf \
+ %{fontconf}-vada.conf \
+ %{fontconf}-yetgul.conf ; do
+ ln -s %{_fontconfig_templatedir}/$fconf \
+ %{buildroot}%{_fontconfig_confdir}/$fconf
+done
%clean
@@ -275,6 +303,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Apr 26 2010 Daiki Ueno <dueno at redhat.com> - 1.0.2-0.10.080608
+- convert to new font packaging guidelines (#477475)
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-0.9.080608
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list