rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.20,1.21

cchance cchance at fedoraproject.org
Thu Jan 14 00:52:26 UTC 2010 

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21189

Modified Files:
	cjkuni-fonts.spec 
Log Message:
- Fixes to rpmlint errors.


Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- cjkuni-fonts.spec	1 Dec 2009 07:41:47 -0000	1.20
+++ cjkuni-fonts.spec	14 Jan 2010 00:52:26 -0000	1.21
@@ -23,7 +23,7 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     34%{?dist}
+Release:     35%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face
 License:     Arphic
 Group:       User Interface/X
@@ -37,17 +37,32 @@ Patch2:     cjkuni-fonts-0.2.20080216.1-
 Patch3:     cjkuni-fonts-0.2.20080216.1-19.patch
 Patch4:     cjkuni-fonts-uming-use-latin.patch
 
-BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildArch:        noarch
 BuildRequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils, ttmkfdir
 
 %description
 %common_desc
 
+%package -n %{fontname}-fonts-common
+Summary:      Common package of CJK Unifonts.
+Group:        User Interface/X
+Obsoletes:    %{fontname}-fonts-common <= 0.2.20080216.1-35
+
+%description -n %{fontname}-fonts-common
+%common_desc
+
+Common package of CJK Unifonts.
+
+%files -n %{fontname}-fonts-common
+%defattr(-,root,root,-)
+%dir %{_fontconfig_templatedir}
+%dir %{_fontconfig_confdir}
+
 %package -n %{fontname}-uming-fonts
-Summary:      Chinese Unicode TrueType font in Ming face.
+Summary:      Chinese Unicode TrueType font in Ming face
 Group:        User Interface/X
-Obsoletes:    %{fontname}-fonts-common < 0.2.20080216.1-32
+Requires:     %{fontname}-fonts-common = %{version}-%{release}
 Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
@@ -56,7 +71,7 @@ Obsoletes:    cjkunifonts-uming < 0.2.20
 CJK Unifonts in Ming face.
 
 %files -n %{fontname}-uming-fonts
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc ../%{umingbuilddir}/license
 %doc ../%{umingbuilddir}/CONTRIBUTERS
 %doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
@@ -68,9 +83,6 @@ CJK Unifonts in Ming face.
 %doc ../%{umingbuilddir}/README
 %doc ../%{umingbuilddir}/TODO
 %dir %{umingdir}
-%dir %{_fontconfig_templatedir}
-%dir %{_fontconfig_confdir}
-%dir %{catalogue}
 %{umingdir}/uming.ttc
 %{umingdir}/fonts.dir
 %{umingdir}/fonts.scale
@@ -79,9 +91,9 @@ CJK Unifonts in Ming face.
 %{catalogue}/%{name}-uming
 
 %package -n %{fontname}-ukai-fonts
-Summary:      Chinese Unicode TrueType font in Kai face.
+Summary:      Chinese Unicode TrueType font in Kai face
 Group:        User Interface/X
-Obsoletes:    %{fontname}-fonts-common < 0.2.20080216.1-32
+Requires:     %{fontname}-fonts-common = %{version}-%{release}
 Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
@@ -90,7 +102,7 @@ Obsoletes:    cjkunifonts-ukai < 0.2.200
 CJK Unifonts in Kai face.
 
 %files -n %{fontname}-ukai-fonts
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc ../%{ukaibuilddir}/license
 %doc ../%{ukaibuilddir}/CONTRIBUTERS
 %doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
@@ -102,9 +114,6 @@ CJK Unifonts in Kai face.
 %doc ../%{ukaibuilddir}/README
 %doc ../%{ukaibuilddir}/TODO
 %dir %{ukaidir}
-%dir %{_fontconfig_templatedir}
-%dir %{_fontconfig_confdir}
-%dir %{catalogue}
 %{ukaidir}/ukai.ttc
 %{ukaidir}/fonts.dir
 %{ukaidir}/fonts.scale
@@ -113,14 +122,12 @@ CJK Unifonts in Kai face.
 %{catalogue}/%{name}-ukai
 
 %package -n %{fontname}-fonts-ghostscript
-Summary:      Chinese Unicode TrueType font ghostscript files.
+Summary:      Chinese Unicode TrueType font ghostscript files
 Group:        User Interface/X
 Requires:     fontpackages-filesystem >= 1.13
 Requires:     ghostscript >= 8.63-4
 Requires:     %{fontname}-uming-fonts = %{version}-%{release}
 Requires:     %{fontname}-ukai-fonts = %{version}-%{release}
-Conflicts:    cjkuni-fonts-common <= 0.2.20080216.1-19
-Obsoletes:    cjkuni-fonts-common < 0.2.20080216.1-32
 
 %description -n %{fontname}-fonts-ghostscript
 %common_desc
@@ -128,7 +135,7 @@ Obsoletes:    cjkuni-fonts-common < 0.2.
 CJK Unifonts ghostscript files.
 
 %files -n %{fontname}-fonts-ghostscript
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %dir %{gsdir}
 %{gsdir}/FAPIcidfmap.zh_TW
 %{gsdir}/FAPIcidfmap.zh_CN
@@ -137,26 +144,6 @@ CJK Unifonts ghostscript files.
 %{gsdir}/CIDFnmap.zh_TW
 %{gsdir}/CIDFnmap.zh_CN
 
-#%package -n %{fontname}-fonts-compat
-#Summary:      Chinese Unicode TrueType font compatibility files.
-#Group:        User Interface/X
-#Requires:     %{fontname}-uming-fonts = %{version}-%{release}
-#Obsoletes:    cjkunifonts-compat < 0.2.20080216.1-16 
-#
-#%description -n %{fontname}-fonts-compat
-#common_desc
-#
-#CJK Unifonts compatibility files.
-#
-#%files -n %{fontname}-fonts-compat
-#%defattr(0644,root,root,0755)
-#%dir %{cncompatdir}
-#%dir %{twcompatdir}
-#%{cncompatdir}/zysong.ttf
-#%{twcompatdir}/bsmi00lp.ttf
-#%{umingtransdir}
-#%{ukaitransdir}
-
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
 %patch1 -p1 -b .1-rhbz466667
@@ -186,17 +173,6 @@ cd ../
 %__install -m 0644 %{ukaibuilddir}/fonts.dir %{buildroot}%{ukaidir}/
 %__install -m 0644 %{ukaibuilddir}/fonts.scale %{buildroot}%{ukaidir}/
 
-#cd %{buildroot}%{umingdir}
-#%{_bindir}/ttmkfdir -d %{buildroot}%{umingdir} \
-#    -o %{buildroot}%{umingdir}/fonts.scale
-#%{_bindir}/mkfontdir %{buildroot}%{umingdir}
-#cd -
-#cd %{buildroot}%{ukaidir}
-#%{_bindir}/ttmkfdir -d %{buildroot}%{ukaidir} \
-#    -o %{buildroot}%{ukaidir}/fonts.scale
-#%{_bindir}/mkfontdir %{buildroot}%{ukaidir}
-#cd -
-
 # *.conf
 %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
 %__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
@@ -220,15 +196,15 @@ done
 cd ../
 
 # drop small bitmap rendering for now
-rm %{buildroot}%{_fontconfig_confdir}/25-ttf-arphic-uming-bitmaps.conf
+%__rm %{buildroot}%{_fontconfig_confdir}/25-ttf-arphic-uming-bitmaps.conf
 
 # ghostscript
 cd %{gsbuilddir}
 %__install -m 0755 -d %{buildroot}%{gsdir}
 for gscid in `ls`
 do
-    cat $gscid | sed --expression='s/###ukailoc###/\/usr\/share\/fonts\/cjkuni-ukai/g' --expression='s/###umingloc###/\/usr\/share\/fonts\/cjkuni-uming/g' > tmp_gs
-    mv tmp_gs $gscid
+    %__cat $gscid | sed --expression='s/###ukailoc###/\/usr\/share\/fonts\/cjkuni-ukai/g' --expression='s/###umingloc###/\/usr\/share\/fonts\/cjkuni-uming/g' > tmp_gs
+    %__mv tmp_gs $gscid
     %__install -m 0644 $gscid %{buildroot}%{gsdir}
 done
 cd ../
@@ -252,6 +228,9 @@ cd ../
 %__rm -fr %{buildroot}
 
 %changelog
+* Thu Jan 14 2010 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-35
+- Fixes to rpmlint error outputs.
+
 * Wed Dec 01 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-34
 - rebuild

More information about the fonts-bugs mailing list