rpms/fonts-japanese/devel fonts-japanese.spec, 1.36, 1.37 sources, 1.8, 1.9

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	fonts-japanese.spec sources 
Log Message:
* Wed Sep 26 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-12
- Remove jisksp16-1990 and knm_new fonts so that it has been packaged separately.
- clean up the spec file.


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fonts-japanese.spec	31 Aug 2007 01:37:15 -0000	1.36
+++ fonts-japanese.spec	26 Sep 2007 12:09:58 -0000	1.37
@@ -16,8 +16,8 @@
 
 Name:           fonts-japanese
 Version:        0.20061016
-Release:        11%{?dist}
-License:        Public Domain and GPL+ and BSD and mplus
+Release:        12%{?dist}
+License:        Public Domain and BSD and mplus
 Group:          User Interface/X
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,13 +30,7 @@
 ## files in jisksp14
 ### Licensed under Public Domain
 Source10:       jisksp14.bdf.gz
-## files in jisksp16-1990
-### Licensed under Public Domain
-Source20:       jisksp16-1990.bdf.gz
-## files in kappa20
-## files in knm_new
-### Licensed under GPL+
-Source40:       http://www.din.or.jp/~storm/fonts/knm_new.tar.gz
+## files in kaname
 ### Licensed under Public Domain
 Source41:       ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/kaname_k12_bdf.tar.gz
 ## files in fonts-ja
@@ -96,8 +90,8 @@
 
 Summary:        Free Japanese Bitmap fonts
 
-Provides:	jisksp14 = 0.1-16, jisksp16-1990 = 0.1-16, kappa20 = 0.3-15, knm_new = 1.1-16, fonts-ja = 8.0-16
-Obsoletes:	jisksp14 <= 0.1-16, jisksp16-1990 <= 0.1-16, kappa20 <= 0.3-15, knm_new <= 1.1-16, fonts-ja <= 8.0-16
+Provides:	jisksp14 = 0.1-16, kappa20 = 0.3-15, fonts-ja = 8.0-16
+Obsoletes:	jisksp14 <= 0.1-16, kappa20 <= 0.3-15, fonts-ja <= 8.0-16
 Requires:       sazanami-fonts-gothic sazanami-fonts-mincho
 
 %description
@@ -106,14 +100,11 @@
 
 %prep
 #%%setup -q -T -c -a 5 -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
-%setup -q -T -c -a 40 -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
+%setup -q -T -c -a 41 -a 50 -a 51 -a 52 -a 53 -a 54 -a 57 -a 58 -a 59 -a 60
 ## ttfonts-ja
 ## jisksp14
 gunzip -c %{SOURCE10} > jisksp14.bdf
-## jisksp16-1990
-gunzip -c %{SOURCE20} > jisksp16-1990.bdf
 ## kappa20
-## knm_new
 ## fonts-ja
 gunzip -c %{SOURCE55} > jiskan16-1990.bdf
 gunzip -c %{SOURCE56} > jiskano16-1997.bdf
@@ -132,10 +123,7 @@
 %build
 ## jisksp14
 bdftopcf jisksp14.bdf | gzip -9 > jisksp14.pcf.gz
-## jisksp16-1990
-bdftopcf jisksp16-1990.bdf | gzip -9 > jisksp16-1990.pcf.gz
 ## kappa20
-## knm_new
 ## fonts-ja
 pushd %{shinonome}-src
 %configure --disable-bold --disable-italic --with-fontdir=$RPM_BUILD_ROOT%{bmpfontdir}
@@ -303,10 +291,7 @@
 install -d $RPM_BUILD_ROOT%{cidmapdir}
 
 ## jisksp14
-install -m 0644 jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
-
-## jisksp16-1990
-install -m 0644 jisksp16-1990.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
+install -m 0644 -p jisksp14.pcf* $RPM_BUILD_ROOT%{bmpfontdir}/
 
 ## kappa20
 
@@ -319,13 +304,13 @@
 ### remove an unnecessary file
 rm -f fonts-ja/mplus_cursors.pcf.gz
 for i in fonts-ja/*.pcf.gz; do
-    install -m 0644 $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i`
+    install -m 0644 -p $i $RPM_BUILD_ROOT%{bmpfontdir}/`basename $i`
 done
 
 # for ghostscript
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE3} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 -p %{SOURCE4} $RPM_BUILD_ROOT%{cidmapdir}/
 
 # Create fonts.scale and fonts.dir
 /usr/bin/mkfontdir $RPM_BUILD_ROOT%{bmpfontdir}
@@ -334,7 +319,7 @@
 touch $RPM_BUILD_ROOT%{bmpfontdir}/fonts.cache-1
 touch $RPM_BUILD_ROOT%{bmpfontdir}/encodings.dir
 
-install -m 0644 fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/
+install -m 0644 -p fonts-ja/fonts.alias $RPM_BUILD_ROOT%{bmpfontdir}/
 
 # Install catalogue symlink
 install -d $RPM_BUILD_ROOT%{catalogue}
@@ -358,7 +343,7 @@
 fi
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc doc.orig readme.kaname_bdf
 %doc fonts-ja/COPYRIGHT* fonts-ja/README* fonts-ja/LICENSE* fonts-ja/ALLFONTS.txt
 %dir %{basefontdir}
@@ -376,6 +361,10 @@
 %{catalogue}/*
 
 %changelog
+* Wed Sep 26 2007 Akira TAGOH <tagoh at redhat.com> - 0.20061016-12
+- Remove jisksp16-1990 and knm_new fonts so that it has been packaged separately.
+- clean up the spec file.
+
 * Fri Aug 31 2007 Akira TAGOH <tagoh at redhat.com>
 - Add jiskan24-2000-{1,2} and jiskan24-2003-1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-japanese/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Aug 2007 01:37:15 -0000	1.8
+++ sources	26 Sep 2007 12:09:58 -0000	1.9
@@ -3,10 +3,8 @@
 77d997789026b1829bb4a33f65a0ce78  jiskan16-1990.bdf.Z
 c9fd21064b4ad6f1af0bcdb40a4222ee  jiskano16-1997.bdf.Z
 e8a452c07cd5d1d31d3a6f32c2b74265  jisksp14.bdf.gz
-d0d24d605ee62833234b711d6766e16c  jisksp16-1990.bdf.gz
 c59fc33f4319a291c1f3f7d58d896b9c  k14-oldkanji.tar.gz
 e0a103ceeffe0aa1c5670458f47452b3  kaname_k12_bdf.tar.gz
-065920714d022cfd225feb6d80b03238  knm_new.tar.gz
 a412bc6920d29be2689b3c3192bcdbd2  marumoji.tgz
 38ce9221d128383a3f9f50eb641da424  shinonome-0.9.11-src.tar.bz2
 c6b7771e4f00e310fe807b3245fd316e  vine-fonttools-0.1.tgz