rpms/scim-tables/devel scim-tables.spec, 1.44, 1.45 scim-tables-0.5.8-1.jk.patch, 1.1, NONE

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/scim-tables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22042

Modified Files:
	scim-tables.spec 
Removed Files:
	scim-tables-0.5.8-1.jk.patch 
Log Message:
- move the Chinese tables disabled by default in scim to a new chinese-extra
  subpackage
- move removal of Japanese tables from scim-tables-0.5.8-1.jk.patch to install



Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/devel/scim-tables.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- scim-tables.spec	24 Jun 2008 03:58:27 -0000	1.44
+++ scim-tables.spec	27 Aug 2008 06:34:07 -0000	1.45
@@ -6,7 +6,7 @@
 
 Name:           scim-tables
 Version:        0.5.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        SCIM Generic Table IMEngine
 
 License:        GPLv2+
@@ -18,15 +18,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires:  scim-devel, gtk2-devel
-BuildRequires:  gettext-devel automake libtool
-%if !%{jk_tables}
-#Obsoletes:     (Nothing to be obsoleted.)
-%endif
+# if autotools scripts modified
+#BuildRequires:  gettext-devel automake libtool
 Requires:       scim
 Patch1:         scim-tables-0.5.7-2.bz217639.patch
 Patch2:		scim-tables-0.5.7-5.bz232860.patch
 Patch3:         scim-tables-0.5.8-1.gcc.patch
-Patch4:         scim-tables-0.5.8-1.jk.patch
 
 %description
 This package contains the Generic Table IMEngine for SCIM.
@@ -65,6 +62,14 @@
 %description chinese
 This package contains scim-tables files for Chinese input.
 
+%package chinese-extra
+Summary:        Additional SCIM tables for Chinese
+Group:          System Environment/Libraries
+Requires:       scim-tables = %{version}
+
+%description chinese-extra
+This package contains additional less used scim-tables files for Chinese input.
+
 %if %{indic_tables}
 %package gujarati
 Summary:        SCIM tables for Gujarati
@@ -210,10 +215,6 @@
 %patch1 -p1 -b .1-217639
 %patch2 -p1 -b .2-232860
 %patch3 -p1 -b .3-gcc
-%if !%{jk_tables}
-%patch4 -p1 -b .4-jk
-autoreconf
-%endif
 
 
 %build
@@ -232,6 +233,10 @@
 rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Bengali,Gujarati,Hindi,Kannada,Malayalam,Punjabi,Tamil,Telugu}-*
 %endif
 
+%if !%{jk_tables}
+rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Hangul,Hanja,HIRAGANA,KATAKANA,Nippon}*
+%endif
+
 %find_lang %{name}
 
 
@@ -280,39 +285,48 @@
 %defattr(-, root, root, -)
 %doc tables/zh/README-*.txt
 %{_datadir}/scim/tables/Array30.bin
-%{_datadir}/scim/tables/CNS11643.bin
-%{_datadir}/scim/tables/CangJie*.bin
-%{_datadir}/scim/tables/Cantonese.bin
+%{_datadir}/scim/icons/Array30.png
+%{_datadir}/scim/tables/CangJie3.bin
+%{_datadir}/scim/icons/CangJie3.png
+%{_datadir}/scim/tables/CangJie5.bin
 %{_datadir}/scim/tables/CantonHK.bin
-%{_datadir}/scim/tables/Dayi3.bin
-%{_datadir}/scim/tables/EZ*.bin
-%{_datadir}/scim/tables/Erbi.bin
-%{_datadir}/scim/tables/Erbi-QS.bin
+%{_datadir}/scim/icons/CantonHK.png
 %{_datadir}/scim/tables/Quick.bin
-%{_datadir}/scim/tables/Jyutping.bin
-%{_datadir}/scim/tables/Simplex.bin
-%{_datadir}/scim/tables/Stroke5.bin
-%{_datadir}/scim/tables/Wu.bin
+%{_datadir}/scim/icons/Quick.png
 %{_datadir}/scim/tables/Wubi.bin
-%{_datadir}/scim/tables/Ziranma.bin
-%{_datadir}/scim/tables/ZhuYin*.bin
-%{_datadir}/scim/icons/Array30.png
+%{_datadir}/scim/icons/Wubi.png
+%{_datadir}/scim/tables/ZhuYin.bin
+%{_datadir}/scim/icons/ZhuYin.png
+
+%files chinese-extra
+%defattr(-, root, root, -)
+%doc tables/zh/README-*.txt
+%{_datadir}/scim/tables/CNS11643.bin
 %{_datadir}/scim/icons/CNS11643.png
-%{_datadir}/scim/icons/CangJie*.png
+%{_datadir}/scim/tables/CangJie.bin
+%{_datadir}/scim/icons/CangJie.png
+%{_datadir}/scim/tables/Cantonese.bin
 %{_datadir}/scim/icons/Cantonese.png
-%{_datadir}/scim/icons/CantonHK.png
+%{_datadir}/scim/tables/Dayi3.bin
 %{_datadir}/scim/icons/Dayi.png
-%{_datadir}/scim/icons/EZ*.png
+%{_datadir}/scim/tables/EZ-Big.bin
+%{_datadir}/scim/icons/EZ.png
+%{_datadir}/scim/tables/Erbi.bin
 %{_datadir}/scim/icons/Erbi.png
+%{_datadir}/scim/tables/Erbi-QS.bin
 %{_datadir}/scim/icons/Erbi-QS.png
+%{_datadir}/scim/tables/Jyutping.bin
 %{_datadir}/scim/icons/Jyutping.png
-%{_datadir}/scim/icons/Quick.png
+%{_datadir}/scim/tables/Simplex.bin
 %{_datadir}/scim/icons/Simplex.png
+%{_datadir}/scim/tables/Stroke5.bin
 %{_datadir}/scim/icons/Stroke5.png
+%{_datadir}/scim/tables/Wu.bin
 %{_datadir}/scim/icons/Wu.png
-%{_datadir}/scim/icons/Wubi.png
-%{_datadir}/scim/icons/Ziranma.png
+%{_datadir}/scim/tables/ZhuYin-Big.bin
 %{_datadir}/scim/icons/ZhuYin.png
+%{_datadir}/scim/tables/Ziranma.bin
+%{_datadir}/scim/icons/Ziranma.png
 
 
 %if %{indic_tables}
@@ -440,6 +454,11 @@
 
 
 %changelog
+* Wed Aug 27 2008 Jens Petersen <petersen at redhat.com> - 0.5.8-4.fc10
+- move the Chinese tables disabled by default in scim to a new chinese-extra
+  subpackage
+- move removal of Japanese tables from scim-tables-0.5.8-1.jk.patch to install
+
 * Tue Jun 24 2008 Jens Petersen <petersen at redhat.com>
 - remove Translit from ukrainian
 


--- scim-tables-0.5.8-1.jk.patch DELETED ---