rpms/scim-tables/FC-4 .cvsignore, 1.4, 1.5 scim-tables.spec, 1.13, 1.14 sources, 1.4, 1.5

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim-tables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30400

Modified Files:
	.cvsignore scim-tables.spec sources 
Log Message:
sync with FC package:
- update to 0.5.5
  - update filelists
- remove the Japanese and Korean tables and subpackages with
  tables-skip-ja-ko.patch and %%{jk_tables}



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Nov 2005 13:53:44 -0000	1.4
+++ .cvsignore	27 Dec 2005 06:38:59 -0000	1.5
@@ -1 +1 @@
-scim-tables-0.5.4.tar.gz
+scim-tables-0.5.5.tar.gz


Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- scim-tables.spec	2 Nov 2005 14:43:22 -0000	1.13
+++ scim-tables.spec	27 Dec 2005 06:38:59 -0000	1.14
@@ -1,6 +1,9 @@
+# set to include Japanese and Korean tables
+%define jk_tables 0
+
 Name:		scim-tables
-Version:	0.5.4
-Release:	2%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -12,6 +15,7 @@
 BuildRequires:	scim-devel, gtk2-devel
 BuildRequires:	gettext-devel
 Requires:	scim
+Patch1:		tables-skip-ja-ko.patch
 
 %description
 This package contains the Generic Table IMEngine for SCIM.
@@ -65,6 +69,7 @@
 %description hindi
 This package contains scim-tables files for Hindi input.
 
+%if %{jk_tables}
 %package japanese
 Summary:	SCIM tables for Japanese
 Group:		System Environment/Libraries
@@ -73,6 +78,7 @@
 
 %description japanese
 This package contains scim-tables files for Japanese.
+%endif
 
 %package kannada
 Summary:	SCIM tables for Kannada
@@ -82,6 +88,7 @@
 %description kannada
 This package contains scim-tables files for Kannada input.
 
+%if %{jk_tables}
 %package korean
 Summary:	SCIM tables for Korean
 Group:		System Environment/Libraries
@@ -90,6 +97,7 @@
 
 %description korean
 This package contains scim-tables files for Korean.
+%endif
 
 %package malayalam
 Summary:	SCIM tables for Malayalam scripts
@@ -167,6 +175,13 @@
 %prep
 %setup -q
 
+%if !%{jk_tables}
+%patch1 -p1 -b -1.JK
+# patch1 touches a Makefile.am file
+autoreconf
+%endif
+
+
 %build
 %configure --disable-static
 make  %{?_smp_mflags}
@@ -179,7 +194,6 @@
 # kill *.a and *.la files
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la
 
-
 %find_lang %{name}
 
 
@@ -199,6 +213,7 @@
 %{_libdir}/scim-1.0/IMEngine/table.so
 %{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so
 %{_datadir}/scim/icons/table.png
+%{_mandir}/man1/scim-make-table.1*
 
 
 %files amharic
@@ -226,17 +241,16 @@
 
 %files chinese
 %defattr(-, root, root, -)
-%doc tables/zh/README-Erbi.txt tables/zh/README-CangJie.txt
+%doc tables/zh/README-*.txt
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Array30.bin
-%{_datadir}/scim/tables/CangJie.bin
-%{_datadir}/scim/tables/CangJie3.bin
+%{_datadir}/scim/tables/CangJie*.bin
 %{_datadir}/scim/tables/Cantonese.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/tables/EZ.bin
 %{_datadir}/scim/tables/Jyutping.bin
 %{_datadir}/scim/tables/Quick.bin
 %{_datadir}/scim/tables/Simplex.bin
@@ -246,14 +260,13 @@
 %{_datadir}/scim/tables/Ziranma.bin
 %{_datadir}/scim/tables/ZhuYin.bin
 %{_datadir}/scim/icons/Array30.png
-%{_datadir}/scim/icons/CangJie.png
-%{_datadir}/scim/icons/CangJie3.png
+%{_datadir}/scim/icons/CangJie*.png
 %{_datadir}/scim/icons/Cantonese.png
 %{_datadir}/scim/icons/CantonHK.png
 %{_datadir}/scim/icons/Dayi.png
+%{_datadir}/scim/icons/EZ*.png
 %{_datadir}/scim/icons/Erbi.png
 %{_datadir}/scim/icons/Erbi-QS.png
-%{_datadir}/scim/icons/EZ.png
 %{_datadir}/scim/icons/Jyutping.png
 %{_datadir}/scim/icons/Quick.png
 %{_datadir}/scim/icons/Simplex.png
@@ -282,9 +295,10 @@
 %{_datadir}/scim/icons/Hindi-phonetic.png
 
 
+%if %{jk_tables}
 %files japanese
 %defattr(-, root, root, -)
-%doc tables/ja/kanjidic_licence.html tables/ja/kanjidic_doc.html
+%doc tables/ja/kanjidic*
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/HIRAGANA.bin
 %{_datadir}/scim/tables/KATAKANA.bin
@@ -292,6 +306,7 @@
 %{_datadir}/scim/icons/HIRAGANA.png
 %{_datadir}/scim/icons/KATAKANA.png
 %{_datadir}/scim/icons/Nippon.png
+%endif
 
 
 %files kannada
@@ -303,6 +318,7 @@
 %{_datadir}/scim/icons/Kannada-kgp.png
 
 
+%if %{jk_tables}
 %files korean
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -311,6 +327,7 @@
 %{_datadir}/scim/tables/Hanja.bin
 %{_datadir}/scim/icons/Hangul.png
 %{_datadir}/scim/icons/Hanja.png
+%endif
 
 
 %files malayalam
@@ -385,6 +402,12 @@
 
 
 %changelog
+* Mon Dec 26 2005 Jens Petersen <petersen at redhat.com> - 0.5.5-1%{?dist}
+- update to 0.5.5
+  - update filelists
+- remove the Japanese and Korean tables and subpackages with
+  tables-skip-ja-ko.patch and %%{jk_tables}
+
 * Wed Dec 1 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.6.0-1%{?dist}
 - update to 0.5.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Nov 2005 13:53:44 -0000	1.4
+++ sources	27 Dec 2005 06:38:59 -0000	1.5
@@ -1 +1 @@
-69ce8f1945ba2ab4bf820386e76c2cd9  scim-tables-0.5.4.tar.gz
+15da0323195dea92690d4b391665b95a  scim-tables-0.5.5.tar.gz