rpms/fonts-korean/devel fonts-korean.spec,1.14,1.15

[Caius Chance (cchance)]

Author: cchance

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

Modified Files:
	fonts-korean.spec 
Log Message:
Updated baekmuk font packages from upstream.



Index: fonts-korean.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-korean/devel/fonts-korean.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fonts-korean.spec	30 Jul 2007 06:07:00 -0000	1.14
+++ fonts-korean.spec	31 Jul 2007 04:56:19 -0000	1.15
@@ -1,9 +1,15 @@
-%define language     korean
-%define basefontdir  %{_datadir}/fonts/%{language}
-%define ttfontdir    %{basefontdir}/TrueType
-%define bmpfontdir   %{basefontdir}/misc
-%define cidmapdir    %{_datadir}/ghostscript/conf.d
+%define language       korean
+%define ttfontverhead  1.0.11.32.2
 
+%define baekmukver     2.2
+%define baekmukdocdir  baekmuk-bdf-%{baekmukver}
+%define baekmukbdfdir  baekmuk-bdf-%{baekmukver}/bdf
+%define baekmukttfdir  baekmuk-ttf-%{baekmukver}/ttf
+
+%define basefontdir    %{_datadir}/fonts/%{language}
+%define ttfontdir      %{basefontdir}/TrueType
+%define bmpfontdir     %{basefontdir}/misc
+%define cidmapdir      %{_datadir}/ghostscript/conf.d
 
 Name:           fonts-korean
 Version:        1.0.11
@@ -14,36 +20,30 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  xorg-x11-font-utils gzip
 
-
-Source0:  ftp://ftp.mizi.com/pub/baekmuk/baekmuk-ttf-2.1.tar.gz
-Source1:  ftp://ftp.mizi.com/pub/baekmuk/baekmuk-doc-2.1.tar.gz
-Source2:  baekmuk-2.1.tar.gz
+Source1:  baekmuk-bdf-2.2.tar.gz
+Source2:  baekmuk-ttf-2.2.tar.gz
 Source3:  FAPIcidfmap.ko
 Source4:  cidfmap.ko
 
-
 Summary:  Free Korean Bitmap/TrueType fonts
 
-
 Requires(post):    ttmkfdir >= 3.0.6, mkfontdir, fontconfig, %{_sbindir}/chkfontpath
 Requires(postun):  fontconfig, %{_sbindir}/chkfontpath
-Obsoletes:         ttfonts-ko
-Provides:          ttfonts-ko
+Provides:          ttfonts-ko = %{ttfontverhead}
+Obsoletes:         ttfonts-ko <= %{ttfontverhead}
 %description
 This package provides the free Korean Bitmap/TrueType fonts.
 
 
 %prep
-%setup -q -T -c -a 0 -a 2
+%setup -q -T -c -a 1 -a 2
 
 
 %build
-for file in *.bdf; do
+mkdir -p $RPM_BUILD_DIR/%{name}-%{version}/doc
+for file in %{baekmukbdfdir}/*.bdf; do
     bdftopcf $file | gzip -9 > ${file%.bdf}.pcf.gz
 done
-mkdir doc; pushd doc
-tar xvfz %{SOURCE1}
-popd
 
 
 %install
@@ -53,14 +53,17 @@
 install -d $RPM_BUILD_ROOT%{bmpfontdir}
 install -d $RPM_BUILD_ROOT%{cidmapdir}
 
-install -m 0644 *.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-install -m 0644 *.pcf.gz $RPM_BUILD_ROOT%{bmpfontdir}/
-install -m 0444 fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/ttfonts-ko.alias
+install -m 0644 %{baekmukttfdir}/*.ttf $RPM_BUILD_ROOT%{ttfontdir}/
+install -m 0644 %{baekmukbdfdir}/*.pcf.gz $RPM_BUILD_ROOT%{bmpfontdir}/
+install -m 0444 %{baekmukbdfdir}/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/ttfonts-ko.alias
 
 # for ghostscript
 install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
 install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
 
+# for docu
+cp $(find %{baekmukdocdir} -maxdepth 1 -type f | xargs) $RPM_BUILD_DIR/%{name}-%{version}/doc/
+
 # for dummy
 touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1
@@ -100,7 +103,7 @@
 
 %files
 %defattr(-, root, root)
-%doc doc
+%doc $RPM_BUILD_DIR/%{name}-%{version}/doc/
 %dir %{basefontdir}
 %dir %{ttfontdir}
 %dir %{bmpfontdir}
@@ -121,7 +124,8 @@
 
 %changelog
 * Thu Jul 26 2006 Parag Nemade <pnemade at redhat.com> - 1.0.11-10
-- spec cleanup.
+- Resolves: rhbz#225767
+            Merge Review: fonts-korean (with baekmuk updation from upstream).
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-9.1.1
 - rebuild