rpms/un-core-fonts/devel Makefile, 1.1, 1.2 un-core-fonts.spec, 1.4, 1.5

Jens Petersen petersen at fedoraproject.org
Fri Jun 26 06:46:10 UTC 2009 

Author: petersen

Update of /cvs/pkgs/rpms/un-core-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22237

Modified Files:
	Makefile un-core-fonts.spec 
Log Message:
- update to new fonts packaging and naming (#477474)
- moved bold (and light) weights into main subpackages (#468618)
- add obsoletes for renaming and former bold subpackages (#468618)




Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	23 Aug 2008 18:09:49 -0000	1.1
+++ Makefile	26 Jun 2009 06:45:39 -0000	1.2
@@ -1,7 +1,7 @@
 # Makefile for source rpm: un-core-fonts
 # $Id$
 NAME := un-core-fonts
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE =  $(NAME).spec
 
 define find-makefile-common
 for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done


Index: un-core-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/un-core-fonts/devel/un-core-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- un-core-fonts.spec	26 Jun 2009 04:30:45 -0000	1.4
+++ un-core-fonts.spec	26 Jun 2009 06:45:39 -0000	1.5
@@ -1,22 +1,21 @@
-%define fontname    un-core 
-%define fontdir     %{_datadir}/fonts/%{fontname}/
-%define fontconfdir %{_sysconfdir}/fonts/conf.d/
+%global fontname un-core
+%global fontconf 65-%{fontname}
 
-%define archivename un-fonts-core
-%define alphatag    080608
+%global alphatag    080608
+%global archivename un-fonts-core-%{version}-%{alphatag}
 
-%define common_desc_en \
+%global common_desc \
 The UN set of Korean TrueType fonts is derived from the HLaTeX Type1 fonts \
 made by Koaunghi Un in 1998. They were converted to TrueType with \
 FontForge(PfaEdit) by Won-kyu Park in 2003. \
 The Un Core set is composed of: \
 \
-- UnBatang, UnBatangBold: serif \
-- UnDinaru, UnDinaruBold, UnDinaruLight: fantasy \
-- UnDotum, UnDotumBold: sans-serif \
-- UnGraphic, UnGraphicBold: sans-serif style \
+- UnBatang: serif \
+- UnDinaru: fantasy \
+- UnDotum: sans-serif \
+- UnGraphic: sans-serif style \
 - UnGungseo: cursive, brush-stroke \
-- UnPilgi, UnPilgiBold: script \
+- UnPilgi: script
 
 %define common_desc_ko \
 은글꼴 시리즈는 HLaTex개발자이신 은광희님이 1998년에 개발한 폰트입니다. \
@@ -24,207 +23,152 @@ The Un Core set is composed of: \
 은글꼴은 가장 일반적인 글꼴들입니다. \
 \
 Core 모음: \
-- 은바탕, 은바탕굵은: serif \
-- 은디나루, 은디나루굵은, 은디나루가는: fantasy \
-- 은돋음, 은돋음굵은: sans-serif \
-- 은그래픽, 은그래픽굵은: sans-serif style \
+- 은바탕: serif \
+- 은디나루: fantasy \
+- 은돋음: sans-serif \
+- 은그래픽: sans-serif style \
 - 은궁서: cursive, brush-stroke \
-- 은필기, 은필기굵은: script \
+- 은필기: script
 
-Name:        %{fontname}-fonts
-Version:     1.0.2
-Release:     0.8.%{alphatag}%{?dist}
-Summary:     Un Core family of Korean TrueType fonts
-Summary(ko): 한글 은글꼴 Core 모음
-
-Group:     User Interface/X
-License:   GPLv2
-URL:       http://kldp.net/projects/unfonts/
-Source0:   http://kldp.net/frs/download.php/4695/%{archivename}-%{version}-%{alphatag}.tar.gz
-Source1:   %{name}-batang-fontconfig.conf
-Source2:   %{name}-batangbold-fontconfig.conf
-Source3:   %{name}-dinaru-fontconfig.conf
-Source4:   %{name}-dinarubold-fontconfig.conf
-Source5:   %{name}-dinarulight-fontconfig.conf
-Source6:   %{name}-dotum-fontconfig.conf
-Source7:   %{name}-dotumbold-fontconfig.conf
-Source8:   %{name}-graphic-fontconfig.conf
-Source9:   %{name}-graphicbold-fontconfig.conf
-Source10:  %{name}-gungseo-fontconfig.conf
-Source11:  %{name}-pilgi-fontconfig.conf
-Source12:  %{name}-pilgibold-fontconfig.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:           %{fontname}-fonts
+Version:        1.0.2
+Release:        0.9.%{alphatag}%{?dist}
+Summary:        Un Core family of Korean TrueType fonts
+Summary(ko):    한글 은글꼴 Core 모음
+
+Group:          User Interface/X
+License:        GPLv2
+URL:            http://kldp.net/projects/unfonts/
+Source0:        http://kldp.net/frs/download.php/4695/%{archivename}.tar.gz
+Source1:        %{name}-batang-fontconfig.conf
+Source2:        %{name}-batangbold-fontconfig.conf
+Source3:        %{name}-dinaru-fontconfig.conf
+Source4:        %{name}-dinarubold-fontconfig.conf
+Source5:        %{name}-dinarulight-fontconfig.conf
+Source6:        %{name}-dotum-fontconfig.conf
+Source7:        %{name}-dotumbold-fontconfig.conf
+Source8:        %{name}-graphic-fontconfig.conf
+Source9:        %{name}-graphicbold-fontconfig.conf
+Source10:       %{name}-gungseo-fontconfig.conf
+Source11:       %{name}-pilgi-fontconfig.conf
+Source12:       %{name}-pilgibold-fontconfig.conf
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+
+%package common
+Summary:        Common files of Un Core fonts
+Requires:       fontpackages-filesystem
 
-BuildArch: noarch
+%description common
+%common_desc
 
+This package consists of files used by other %{name} packages.
 
+# un_subpkg 1:name 2:Name 3:Hangul [4:obsolete] [5:obsolete]
 %define un_subpkg() \
-%package %1 \
-Summary:     Un Core fonts - %(echo %2) \
-Summary(ko): 한글 은글꼴 Core 모음 - %(echo %3) \
-Group:       User Interface/X \
+%package -n %{fontname}-%1-fonts \
+Summary:        Un Core fonts - %(echo %2) \
+Summary(ko):    한글 은글꼴 Core 모음 - %(echo %3) \
+Group:          User Interface/X \
+Requires:       %{name}-common = %{version}-%{release} \
+Obsoletes:      un-core-fonts-%1 < 1.0.2-0.9, %{?4:un-core-fonts-%{1}%{4} < 1.0.2-0.9},  %{?5:un-core-fonts-%{1}%{5} < 1.0.2-0.9} \
 \
 \
-%post %1 \
+%post -n %{fontname}-%1-fonts \
 if [ -x %{_bindir}/fc-cache ]; then \
-    %{_bindir}/fc-cache %{fontdir} || : \
+    %{_bindir}/fc-cache %{_fontdir} || : \
 fi \
 \
 \
-%postun %1 \
+%postun -n %{fontname}-%1-fonts \
 if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \
-    %{_bindir}/fc-cache %{fontdir} || : \
+    %{_bindir}/fc-cache %{_fontdir} || : \
 fi\
 \
 \
-%files %1 \
+%files -n %{fontname}-%1-fonts \
 %defattr(0644,root,root,0755) \
-%doc COPYING README \
-\
-%config(noreplace) %{fontconfdir}65-%{fontname}-%(echo %1).conf \
-\
-%dir %{fontdir} \
-%{fontdir}%(echo %2).ttf
-
-%un_subpkg batang UnBatang 은바탕
-%un_subpkg batangbold UnBatangBold 은바탕굵은
-%un_subpkg dinaru UnDinaru 은디나루
-%un_subpkg dinarubold UnDinaruBold 은디나루굵은
-%un_subpkg dinarulight UnDinaruLight 은디나루가는
-%un_subpkg dotum UnDotum 은돋음
-%un_subpkg dotumbold UnDotumBold 은돋음굵은
-%un_subpkg graphic UnGraphic 은그래픽
-%un_subpkg graphicbold UnGraphicBold 은그래픽굵은
+%config(noreplace) %{_fontconfig_templatedir}/%{fontconf}-%(echo %1)*.conf \
+%config(noreplace) %{_fontconfig_confdir}/%{fontconf}-%(echo %1)*.conf \
+%dir %{_fontdir} \
+%{_fontdir}/%(echo %2)*.ttf
+
+%un_subpkg batang UnBatang 은바탕 bold 
+%un_subpkg dinaru UnDinaru 은디나루 bold light
+%un_subpkg dotum UnDotum 은돋음 bold
+%un_subpkg graphic UnGraphic 은그래픽 bold
 %un_subpkg gungseo UnGungseo 은궁서
-%un_subpkg pilgi UnPilgi 은필기
-%un_subpkg pilgibold UnPilgiBold 은필기긁은
+%un_subpkg pilgi UnPilgi 은필기 bold
 
 
 %description
-%common_desc_en
+%common_desc
 
 %description -l ko
 %common_desc_ko
 
-%description batang
-%common_desc_en
+%description -n %{fontname}-batang-fonts
+%common_desc
 
 This package includes UnBatang, a serif font.
 
-%description -l ko batang
+%description -l ko -n %{fontname}-batang-fonts
 %common_desc_ko
 
 이 패키지에는 은바탕글꼴이 포함되어 있습니다.
 
-%description batangbold
-%common_desc_en
-
-This package includes UnBatangBold, a serif font.
-
-%description -l ko batangbold
-%common_desc_ko
-
-이 패키지에는 은바탕굵은글꼴이 포함되어 있습니다.
-
-%description dinaru
-%common_desc_en
+%description -n %{fontname}-dinaru-fonts
+%common_desc
 
 This package includes UnDinaru, a fantasy font.
 
-%description -l ko dinaru
+%description -l ko -n %{fontname}-dinaru-fonts
 %common_desc_ko
 
 이 패키지에는 은디나루글꼴이 포함되어 있습니다.
-%description dinarubold
-%common_desc_en
 
-This package includes UnDinaruBold, a fantasy font.
-
-%description -l ko dinarubold
-%common_desc_ko
-
-이 패키지에는 은디나루굵은글꼴이 포함되어 있습니다.
-
-%description dinarulight
-%common_desc_en
-
-This package includes UnDinaruLight, a fantasy font.
-
-%description -l ko dinarulight
-%common_desc_ko
-
-이 패키지에는 은디나루가는글꼴이 포함되어 있습니다.
-
-%description dotum
-%common_desc_en
+%description -n %{fontname}-dotum-fonts
+%common_desc
 
 This package includes UnDotum, a sans-serif font.
 
-%description -l ko dotum
+%description -l ko -n %{fontname}-dotum-fonts
 %common_desc_ko
 
 이 패키지에는 은돋음글꼴이 포함되어 있습니다.
 
-%description dotumbold
-%common_desc_en
-
-This package includes UnDotum, a sans-serif font.
-
-%description -l ko dotumbold
-%common_desc_ko
-
-이 패키지에는 은돋음굵은글꼴이 포함되어 있습니다.
-
-%description graphic
-%common_desc_en
+%description -n %{fontname}-graphic-fonts
+%common_desc
 
 This package includes UnGraphic, a sans-serif font.
 
-%description -l ko graphic
+%description -l ko -n %{fontname}-graphic-fonts
 %common_desc_ko
 
 이 패키지에는 은그래픽글꼴이 포함되어 있습니다.
 
-%description graphicbold
-%common_desc_en
-
-This package includes UnGraphicBold, a sans-serif font.
-
-%description -l ko graphicbold
-%common_desc_ko
-
-이 패키지에는 은그래픽굵은글꼴이 포함되어 있습니다.
-
-%description gungseo
-%common_desc_en
+%description -n %{fontname}-gungseo-fonts
+%common_desc
 
 This package includes UnGungseo, a cursive font.
 
-%description -l ko gungseo
+%description -l ko -n %{fontname}-gungseo-fonts
 %common_desc_ko
 
 이 패키지에는 은궁서글꼴이 포함되어 있습니다.
 
-%description pilgi
-%common_desc_en
+%description -n %{fontname}-pilgi-fonts
+%common_desc
 
 This package includes UnPilgi, a script font.
 
-%description -l ko pilgi
+%description -l ko -n %{fontname}-pilgi-fonts
 %common_desc_ko
 
 이 패키지에는 은필기글꼴이 포함되어 있습니다.
 
-%description pilgibold
-%common_desc_en
-
-This package includes UnPilgiBold, a script font.
-
-%description -l ko pilgibold
-%common_desc_ko
-
-이 패키지에는 은필기긁은글꼴이 포함되어 있습니다.
-
 
 %prep
 %setup -q -n un-fonts
@@ -236,41 +180,55 @@ This package includes UnPilgiBold, a scr
 %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 -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-install -dm 0755 -d %{buildroot}%{fontconfdir}
-install -pm 0644 -p %{SOURCE1}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-batang.conf
-install -pm 0644 -p %{SOURCE2}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-batangbold.conf
-install -pm 0644 -p %{SOURCE3}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-dinaru.conf
-install -pm 0644 -p %{SOURCE4}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-dinarubold.conf
-install -pm 0644 -p %{SOURCE5}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-dinarulight.conf
-install -pm 0644 -p %{SOURCE6}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-dotum.conf
-install -pm 0644 -p %{SOURCE7}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-dotumbold.conf
-install -pm 0644 -p %{SOURCE8}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-graphic.conf
-install -pm 0644 -p %{SOURCE9}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-graphicbold.conf
-install -pm 0644 -p %{SOURCE10}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-gungseo.conf
-install -pm 0644 -p %{SOURCE11}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-pilgi.conf
-install -pm 0644 -p %{SOURCE12}\
-        %{buildroot}%{fontconfdir}65-%{fontname}-pilgibold.conf
+install -m 0644 -p %{SOURCE1}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-batang.conf
+install -m 0644 -p %{SOURCE2}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-batangbold.conf
+install -m 0644 -p %{SOURCE3}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-dinaru.conf
+install -m 0644 -p %{SOURCE4}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-dinarubold.conf
+install -m 0644 -p %{SOURCE5}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-dinarulight.conf
+install -m 0644 -p %{SOURCE6}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-dotum.conf
+install -m 0644 -p %{SOURCE7}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-dotumbold.conf
+install -m 0644 -p %{SOURCE8}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-graphic.conf
+install -m 0644 -p %{SOURCE9}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-graphicbold.conf
+install -m 0644 -p %{SOURCE10}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-gungseo.conf
+install -m 0644 -p %{SOURCE11}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pilgi.conf
+install -m 0644 -p %{SOURCE12}\
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pilgibold.conf
+
+ln -s $(echo %{buildroot}%{_fontconfig_templatedir}/*.conf | sed -e "s!%{buildroot}!!g") %{buildroot}%{_fontconfig_confdir}
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%files common
+%defattr(0644,root,root,0755)
+%doc COPYING README
+
+
 %changelog
+* Fri Jun 26 2009 Jens Petersen <petersen at redhat.com> - 1.0.2-0.9.080608
+- update to new fonts packaging and naming (#477474)
+- moved bold (and light) weights into main subpackages (#468618)
+- add obsoletes for renaming and former bold subpackages (#468618)
+
 * Fri Jun 26 2009 Jens Petersen <petersen at redhat.com> - 1.0.2-0.8.080608
 - fix filelist to only include specific font (#496795)

More information about the fonts-bugs mailing list