rpms/scim-tables/FC-3 tables-skip-ja-ko.patch, NONE, 1.1 scim-tables.spec, 1.9, 1.10 sources, 1.4, 1.5

[Jens Petersen (petersen)]

Author: petersen

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

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


tables-skip-ja-ko.patch:

--- NEW FILE tables-skip-ja-ko.patch ---
--- scim-tables-0.5.5/configure.ac~	2005-12-05 15:37:12.000000000 +0900
+++ scim-tables-0.5.5/configure.ac	2005-12-26 17:02:55.000000000 +0900
@@ -126,14 +126,6 @@
 		 tables/zh/Wubi.txt
 		 tables/zh/Ziranma.txt
 		 tables/zh/ZhuYin.txt
-		 tables/ja/Makefile
-		 tables/ja/HIRAGANA.txt
-		 tables/ja/KATAKANA.txt
-		 tables/ja/Nippon.txt
-		 tables/ko/Makefile
-		 tables/ko/Hangul.txt
-		 tables/ko/HangulRomaja.txt
-		 tables/ko/Hanja.txt
 		 tables/bn/Makefile
 		 tables/bn/Bengali-inscript.txt
 		 tables/bn/Bengali-probhat.txt
--- scim-tables-0.5.5/icons/Makefile.am~	2005-10-12 19:56:43.000000000 +0900
+++ scim-tables-0.5.5/icons/Makefile.am	2005-12-26 17:05:09.000000000 +0900
@@ -35,19 +35,14 @@
 			  EZ.png        \
 			  Gujarati-inscript.png	\
 			  Gujarati-phonetic.png	\
-			  Hangul.png    \
-			  Hanja.png     \
 			  Hindi-inscript.png	\
 			  Hindi-phonetic.png	\
-			  HIRAGANA.png  \
 			  Jyutping.png  \
-			  KATAKANA.png  \
 			  Kannada-inscript.png	\
 			  Kannada-kgp.png	\
 			  LaTeX.png     \
 			  Malayalam-inscript.png	\
 			  Nepali.png    \
-			  Nippon.png    \
 			  Punjabi-inscript.png	\
 			  Punjabi-jhelum.png	\
 			  Punjabi-phonetic.png	\
--- scim-tables-0.5.5/tables/Makefile.am~	2005-10-30 02:00:15.000000000 +0900
+++ scim-tables-0.5.5/tables/Makefile.am	2005-12-26 16:52:09.000000000 +0900
@@ -18,5 +18,5 @@
 MAINTAINERCLEANFILES 	= Makefile.in
 CLEANFILES		= *.bak 
 
-SUBDIRS 		= additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh
+SUBDIRS 		= additional am ar bn gu hi kn ml ne pa ru ta te th vi zh
 


Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-tables.spec	2 Nov 2005 14:37:28 -0000	1.9
+++ scim-tables.spec	27 Dec 2005 06:44:56 -0000	1.10
@@ -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-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Nov 2005 14:36:52 -0000	1.4
+++ sources	27 Dec 2005 06:44:56 -0000	1.5
@@ -1 +1 @@
-69ce8f1945ba2ab4bf820386e76c2cd9  scim-tables-0.5.4.tar.gz
+15da0323195dea92690d4b391665b95a  scim-tables-0.5.5.tar.gz