rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.22,1.23

[kaio]

Author: kaio

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21476

Modified Files:
	cjkuni-fonts.spec 
Log Message:
* Mon May 24 2010 Caius 'kaio' Chance <cchance at redhat.com> - 0.2.20080216.1-37
- Removed ownership of general directories.



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- cjkuni-fonts.spec	2 Mar 2010 03:41:47 -0000	1.22
+++ cjkuni-fonts.spec	24 May 2010 06:25:23 -0000	1.23
@@ -14,16 +14,13 @@ the CJK Unifonts project.
 %define ukaibuilddir     %{fontname}-ukai-fonts-%{version}
 %define gsbuilddir       %{fontname}-fonts-gscid-0.1
 
-%define cncompatdir      %{_datadir}/fonts/zh_CN/TrueType
-%define twcompatdir      %{_datadir}/fonts/zh_TW/TrueType
-
 %define _transdir        %{_datadir}/fonts/cjkunifonts-
 %define umingtransdir    %{_transdir}uming
 %define ukaitransdir     %{_transdir}ukai
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     36%{?dist}
+Release:     37%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face
 License:     Arphic
 Group:       User Interface/X
@@ -44,21 +41,6 @@ BuildRequires:    fontpackages-devel >= 
 %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
 Group:        User Interface/X
@@ -173,9 +155,8 @@ cd ../
 %__install -m 0644 %{ukaibuilddir}/fonts.scale %{buildroot}%{ukaidir}/
 
 # *.conf
-%__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
-%__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
-
+%__install -d 0755 %{buildroot}%{_fontconfig_confdir}/
+%__install -d 0755 %{buildroot}%{_fontconfig_templatedir}/
 cd %{umingbuilddir}
 for fconf in `ls *-ttf-arphic-uming*.conf`
 do
@@ -198,8 +179,8 @@ cd ../
 %__rm %{buildroot}%{_fontconfig_confdir}/25-ttf-arphic-uming-bitmaps.conf
 
 # ghostscript
+%__install -d 0755 %{buildroot}%{gsdir}/
 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
@@ -209,24 +190,17 @@ done
 cd ../
 
 # catalogue
-%__install -m 0755 -d %{buildroot}%{catalogue}
+%__install -d 0755 %{buildroot}%{catalogue}/
 %__ln_s %{umingdir}/ %{buildroot}%{catalogue}/%{name}-uming
 %__ln_s %{ukaidir}/ %{buildroot}%{catalogue}/%{name}-ukai
 
-# backward compat to obsoleted ttf
-#%__install -m 0755 -d %{buildroot}%{cncompatdir}
-#%__install -m 0755 -d %{buildroot}%{twcompatdir}
-#%__ln_s %{umingdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
-#%__ln_s %{umingdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
-
-# backward compt to transition dir
-#%__ln_s %{umingdir}/ %{buildroot}%{umingtransdir}
-#%__ln_s %{ukaidir}/ %{buildroot}%{ukaitransdir}
-
 %clean
 %__rm -fr %{buildroot}
 
 %changelog
+* Mon May 24 2010 Caius 'kaio' Chance <cchance at redhat.com> - 0.2.20080216.1-37
+- Removed ownership of general directories.
+
 * Tue Mar 02 2010 Caius 'kaio' Chance <cchance at redhat.com> - 0.2.20080216.1-36
 - Fixes inappropriate ownership of /usr/share/ghostscript/conf.d (rhbz#569433)