rpms/cjkunifonts/devel cjkunifonts.spec,1.22,1.23

Caius Chance cchance at fedoraproject.org
Tue Jan 6 01:22:00 UTC 2009 

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17600

Modified Files:
	cjkunifonts.spec 
Log Message:
* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.fc11
- Resolves: rhbz#477373 (Converted to new font packaging guidelines.)

modified .spec file according to guidelines



Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cjkunifonts.spec	7 Dec 2008 09:13:01 -0000	1.22
+++ cjkunifonts.spec	6 Jan 2009 01:21:29 -0000	1.23
@@ -1,3 +1,12 @@
+%define fontname cjkunifonts
+%define fontconf <65>-%{fontname}
+%define archivename %{name}-%{version}
+%define common_desc \
+Chinese Unicode TrueType fonts derived from the original fonts generously made
+available by Arphic Technology under the "Arphic Public License" and extended
+by the CJK Unifonts project.
+
+
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
 %define fcdir           %{_sysconfdir}/fonts/conf.d
@@ -7,10 +16,9 @@
 %define umingbuilddir   ../%{name}-uming-%{version}
 %define ukaibuilddir    ../%{name}-ukai-%{version}
 
-Name:        cjkunifonts
+Name:        %{fontname}
 Version:     0.2.20080216.1
-Release:     10.fc11
-#Release:     9.1%{?dist}
+Release:     11%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -26,24 +34,25 @@
 Source8:    CIDFnmap.zh_CN
 Patch1:     cjkunifonts-0.2.20080216.1-2.patch
 
-BuildRequires:    xorg-x11-font-utils, ttmkfdir
+BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:        noarch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-root
+BuildRequires:    fontpackages-devel, xorg-x11-font-utils, ttmkfdir
 
 %description
-Chinese Unicode TrueType fonts derived from the original fonts generously made
-available by Arphic Technology under the "Arphic Public License" and extended
-by the CJK Unifonts project.
+%common_desc
 
 %package uming
 Summary:      Chinese Uming style face TrueType Font
 License:      Arphic
 Group:        User Interface/X
+Requires:     fontpackages-filesystem
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
 
 %description uming
+%common_desc
+
 Chinese Uming style face TrueType Font derived from the original fonts released
 by Arphic Technology and extended by the CJK Unifonts project.
 
@@ -51,11 +60,14 @@
 Summary:      Chinese Ukai style face TrueType font
 License:      Arphic
 Group:        User Interface/X
+Requires:     fontpackages-filesystem
 Conflicts:    fonts-chinese <= 3.03-9.fc8
 Obsoletes:    fonts-chinese < 3.03-13
 Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
 
 %description ukai
+%common_desc
+
 Chinese Ukai style face TrueType Font derived from the original fonts released
 by Arphic Technology and extended by the CJK Unifonts project.
 
@@ -68,55 +80,59 @@
 %{nil}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # dirs
-install -d $RPM_BUILD_ROOT%{catalogue}
-install -d $RPM_BUILD_ROOT%{umingfontdir}
-install -d $RPM_BUILD_ROOT%{ukaifontdir}
+install -d %{buildroot}%{catalogue}
+install -d %{buildroot}%{umingfontdir}
+install -d %{buildroot}%{ukaifontdir}
 
 # ttfs
-install -m 0644 %{umingbuilddir}/uming.ttc $RPM_BUILD_ROOT%{umingfontdir}/
-install -m 0644 %{ukaibuilddir}/ukai.ttc $RPM_BUILD_ROOT%{ukaifontdir}/
+install -m 0644 %{umingbuilddir}/uming.ttc %{buildroot}%{umingfontdir}/
+install -m 0644 %{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaifontdir}/
 
 # fonts.{scale,dir}
-%{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{umingfontdir} -o $RPM_BUILD_ROOT%{umingfontdir}/fonts.scale
-mkfontdir $RPM_BUILD_ROOT%{umingfontdir}
-%{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{ukaifontdir} -o $RPM_BUILD_ROOT%{ukaifontdir}/fonts.scale
-mkfontdir $RPM_BUILD_ROOT%{ukaifontdir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{umingfontdir} -o %{buildroot}%{umingfontdir}/fonts.scale
+mkfontdir %{buildroot}%{umingfontdir}
+%{_bindir}/ttmkfdir -d %{buildroot}%{ukaifontdir} -o %{buildroot}%{ukaifontdir}/fonts.scale
+mkfontdir %{buildroot}%{ukaifontdir}
 
 # fontconfig config files
-install -d $RPM_BUILD_ROOT%{fcdir}
-for conf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
+install -d %{buildroot}%{fcdir}
+for fconf in `ls %{umingbuilddir}/*-ttf-arphic-uming*.conf`
 do
-    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdir}/
+    install -m 0644 $fconf %{buildroot}%{fcdir}/
+    ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
-for conf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
+for fconf in `ls %{ukaibuilddir}/*-ttf-arphic-ukai*.conf`
 do
-    install -m 0644 $conf $RPM_BUILD_ROOT%{fcdir}/
+    install -m 0644 $fconf %{buildroot}%{fcdir}/
+    ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
 # backward compat
-install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
-install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType
-%{__ln_s} ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%{__ln_s} ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
+install -d %{buildroot}%{_datadir}/fonts/zh_CN/TrueType
+install -d %{buildroot}%{_datadir}/fonts/zh_TW/TrueType
+%{__ln_s} ../../%{name}-uming/uming.ttc %{buildroot}%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+%{__ln_s} ../../%{name}-uming/uming.ttc %{buildroot}%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 # catalogue
-%{__ln_s} %{umingfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-uming
-%{__ln_s} %{ukaifontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-ukai
+%{__ln_s} %{umingfontdir} %{buildroot}%{catalogue}/%{name}-uming
+%{__ln_s} %{ukaifontdir} %{buildroot}%{catalogue}/%{name}-ukai
 
 # ghostscript
-install -d $RPM_BUILD_ROOT%{cidmapdir}
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{cidmapdir}/
+install -d %{buildroot}%{cidmapdir}
+install -m 0644 %{SOURCE3} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE4} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE5} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE6} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE7} %{buildroot}%{cidmapdir}/
+install -m 0644 %{SOURCE8} %{buildroot}%{cidmapdir}/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr ${buildroot}
 
 %post uming
 if [ -x %{_bindir}/fc-cache ]; then
@@ -143,7 +159,7 @@
 fi
 
 %files uming
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %doc %{umingbuilddir}/license
 %doc %{umingbuilddir}/CONTRIBUTERS
 %doc %{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
@@ -174,7 +190,7 @@
 %{catalogue}/%{name}-uming
 
 %files ukai
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %doc %{ukaibuilddir}/license
 %doc %{ukaibuilddir}/CONTRIBUTERS
 %doc %{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
@@ -199,6 +215,9 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Tue Jan 06 2009 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-11.fc11
+- Resolves: rhbz#477373 (Converted to new font packaging guidelines.)
+
 * Sun Dec  7 2008 Behdad Esfahbod <besfahbo at redhat.com> - 0.2.20080216.1-10.fc11
 - Don't umask before fc-cache.
 - Add -f to fc-cache.

More information about the Fedora-fonts-bugs-list mailing list