rpms/fonts-chinese/devel fonts-chinese.spec,1.47,1.48

[Caius Chance (cchance)]

Author: cchance

Update of /cvs/pkgs/rpms/fonts-chinese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18809

Modified Files:
	fonts-chinese.spec 
Log Message:
* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-12.fc8
- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
  <<<<< Taipei fonts was moved to a separate package taipeifonts.
  <<<<< Improved: % defattr(-,root,root,-)
  <<<<<-Put taipeifonts after cjkunifonts in the requires.

* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-11.fc8
- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
  <<<<< Tidy up spec file.



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- fonts-chinese.spec	31 Aug 2007 08:20:41 -0000	1.47
+++ fonts-chinese.spec	30 Sep 2007 23:14:19 -0000	1.48
@@ -1,74 +1,44 @@
-%define basefontdir    %{_datadir}/fonts/chinese
-%define miscfontdir    %{basefontdir}/misc
-%define catalogue      /etc/X11/fontpath.d
-
-%define taipeiver 1.2
-
-Summary:     Traditional Chinese bitmap fonts and meta-package for Chinese fonts
 Name:         fonts-chinese
-Version:      3.03
-Release:      10%{?dist}
-License:      Public Domain
+Summary:      Meta-package for Chinese fonts
+License:      GPLv2+
 Group:        User Interface/X
+Version:      3.03
+Release:      12%{?dist}
 BuildArch:    noarch
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
-
-Source1:     taipeifonts-%{taipeiver}.tar.gz
-Source2:     taipeifonts.alias
+BuildRoot:    %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:       xorg-x11-font-utils
-Obsoletes:           ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28, ttf-moe_sung, ttf-moe_kai, ttf-arphic_bming, ttf-arphic_bkai, taipeifonts
-Requires:            cjkunifonts-uming, cjkunifonts-ukai
+Requires:     cjkunifonts-uming, cjkunifonts-ukai
+Requires:     taipeifonts
 
 %description
-This package includes some Traditional Chinese bitmap fonts and also acts
-as a meta-package for general Chinese fonts support.
+This is a meta-package for Chinese fonts support.
 
 %prep
-%setup -q -T -c -a1
+%{nil}
 
 %build
-pushd taipeifonts-%{taipeiver}/
-bdftopcf taipei24.bdf | gzip -c > taipei24.pcf.gz
-bdftopcf taipei20.bdf | gzip -c > taipei20.pcf.gz
-bdftopcf taipei16.bdf | gzip -c > taipei16.pcf.gz
-popd
+%{nil}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
-
-# for catalogue
-install -d $RPM_BUILD_ROOT%{catalogue}
-ln -s %{miscfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
-
-# for fonts.*
-mkfontdir $RPM_BUILD_ROOT%{miscfontdir}
-
-touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-, root, root)
-%dir %{basefontdir}
-%dir %{miscfontdir}
-%{miscfontdir}/*.gz
-%{miscfontdir}/fonts.alias
-%ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
-%verify(not md5 size mtime) %{miscfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1
-%{catalogue}/%{name}
+%defattr(-,root,root,-)
 
 %changelog
+* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-12.fc8
+- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
+  <<<<< Taipei fonts was moved to a separate package taipeifonts.
+  <<<<< Improved: % defattr(-,root,root,-)
+  <<<<<-Put taipeifonts after cjkunifonts in the requires.
+
+* Thu Sep 27 2007 Caius Chance <cchance at redhat.com> - 3.03-11.fc8
+- Resolves: rhbz#225761 (Convert fonts-chinese into meta-package.)
+  <<<<< Tidy up spec file.
+
 * Fri Aug 31 2007 Jens Petersen <petersen at redhat.com> - 3.03-10.fc8
 - finish moving Uming and Ukai truetype fonts over to cjkunifonts (#266281):
 - update summary and description
@@ -82,7 +52,7 @@
 - Resolves: rhbz#266281 (Remove uming and ukai from fonts-chinese.)
 -- remove ttfontdir and cidmapdir
 -- update license to Public Domain for taipeifonts
--- remove %{_datadir}/fonts/zh_*/TrueType/ compat dirs
+-- remove % {_datadir}/fonts/zh_*/TrueType/ compat dirs
 -- remove fc-cache from post and postun scriptlets
 
 * Mon Aug 27 2007 Caius Chance <cchance at redhat.com> - 3.03-9.fc8