rpms/scim-tables/FC-4 .cvsignore, 1.5, 1.6 scim-tables.spec, 1.14, 1.15 sources, 1.5, 1.6

Thu May 4 09:26:58 UTC 2006

Author: petersen

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

Modified Files:
	.cvsignore scim-tables.spec sources 
Log Message:
sync with Core:
- obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt)

* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com>
- add %%indic_tables build switch

* Thu Feb  9 2006 Jens Petersen <petersen at redhat.com>
- update filelist since moduledir is now api-versioned

* Fri Jan 13 2006 Jens Petersen <petersen at redhat.com>
- update to 0.5.6 release
  - update tables-skip-ja-ko.patch
  - updates filelist for chinese tables




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	27 Dec 2005 06:38:59 -0000	1.5
+++ .cvsignore	4 May 2006 09:26:57 -0000	1.6
@@ -1 +1 @@
-scim-tables-0.5.5.tar.gz
+scim-tables-0.5.6.tar.gz


Index: scim-tables.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim-tables.spec	27 Dec 2005 06:38:59 -0000	1.14
+++ scim-tables.spec	4 May 2006 09:26:57 -0000	1.15
@@ -1,8 +1,11 @@
 # set to include Japanese and Korean tables
 %define jk_tables 0
 
+# set to include Indic tables
+%define indic_tables 1
+
 Name:		scim-tables
-Version:	0.5.5
+Version:	0.5.6
 Release:	1%{?dist}
 Summary:	SCIM Generic Table IMEngine
 
@@ -14,6 +17,9 @@
 
 BuildRequires:	scim-devel, gtk2-devel
 BuildRequires:	gettext-devel
+%if !%{jk_tables}
+Obsoletes:	scim-tables-japanese < 0.5.6, scim-tables-korean < 0.5.6
+%endif
 Requires:	scim
 Patch1:		tables-skip-ja-ko.patch
 
@@ -36,6 +42,7 @@
 %description arabic
 This package contains scim-tables files for Chinese input.
 
+%if %{indic_tables}
 %package bengali
 Summary:	SCIM tables for Bengali
 Group:		System Environment/Libraries
@@ -43,6 +50,7 @@
 
 %description bengali
 This package contains scim-tables files for Bengali input.
+%endif
 
 %package chinese
 Summary:	SCIM tables for Chinese
@@ -53,6 +61,7 @@
 %description chinese
 This package contains scim-tables files for Chinese input.
 
+%if %{indic_tables}
 %package gujarati
 Summary:	SCIM tables for Gujarati
 Group:		System Environment/Libraries
@@ -68,6 +77,7 @@
 
 %description hindi
 This package contains scim-tables files for Hindi input.
+%endif
 
 %if %{jk_tables}
 %package japanese
@@ -80,6 +90,7 @@
 This package contains scim-tables files for Japanese.
 %endif
 
+%if %{indic_tables}
 %package kannada
 Summary:	SCIM tables for Kannada
 Group:		System Environment/Libraries
@@ -87,6 +98,7 @@
 
 %description kannada
 This package contains scim-tables files for Kannada input.
+%endif
 
 %if %{jk_tables}
 %package korean
@@ -99,6 +111,7 @@
 This package contains scim-tables files for Korean.
 %endif
 
+%if %{indic_tables}
 %package malayalam
 Summary:	SCIM tables for Malayalam scripts
 Group:		System Environment/Libraries
@@ -106,6 +119,7 @@
 
 %description malayalam
 This package contains scim-tables files for Malayalam languages.
+%endif
 
 %package nepali
 Summary:	SCIM tables for 
@@ -113,8 +127,9 @@
 Requires:	scim-tables = %{version}
 
 %description nepali
-This package contains scim-tables files for  input.
+This package contains scim-tables files for Nepali input.
 
+%if %{indic_tables}
 %package punjabi
 Summary:	SCIM tables for Punjabi
 Group:		System Environment/Libraries
@@ -122,6 +137,7 @@
 
 %description punjabi
 This package contains scim-tables files for Punjabi input.
+%endif
 
 %package russian
 Summary:	SCIM tables for Russian
@@ -131,6 +147,7 @@
 %description russian
 This package contains scim-tables files for Russian input.
 
+%if %{indic_tables}
 %package tamil
 Summary:	SCIM tables for Tamil
 Group:		System Environment/Libraries
@@ -138,6 +155,7 @@
 
 %description tamil
 This package contains scim-tables files for Tamil input.
+%endif
 
 %package thai
 Summary:	SCIM tables for Thai
@@ -147,6 +165,7 @@
 %description thai
 This package contains scim-tables files for Thai input.
 
+%if %{indic_tables}
 %package telugu
 Summary:	SCIM tables for Telugu
 Group:		System Environment/Libraries
@@ -154,6 +173,7 @@
 
 %description telugu
 This package contains scim-tables files for Telugu input.
+%endif
 
 %package vietnamese
 Summary:	SCIM tables for Vietnamese
@@ -192,7 +212,11 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 
 # kill *.a and *.la files
-rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*.la
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.la
+
+%if !%{indic_tables}
+rm ${RPM_BUILD_ROOT}/%{_datadir}/scim/{icons,tables}/{Bengali,Gujarati,Hindi,Kannada,Malayalam,Punjabi,Tamil,Telugu}-*
+%endif
 
 %find_lang %{name}
 
@@ -210,8 +234,8 @@
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %{_bindir}/scim-make-table
-%{_libdir}/scim-1.0/IMEngine/table.so
-%{_libdir}/scim-1.0/SetupUI/table-imengine-setup.so
+%{_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*
 
@@ -230,6 +254,7 @@
 %{_datadir}/scim/icons/Arabic.png
 
 
+%if %{indic_tables}
 %files bengali
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -237,13 +262,14 @@
 %{_datadir}/scim/tables/Bengali-probhat.bin
 %{_datadir}/scim/icons/Bengali-inscript.png
 %{_datadir}/scim/icons/Bengali-probhat.png
-
+%endif
 
 %files chinese
 %defattr(-, root, root, -)
 %doc tables/zh/README-*.txt
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Array30.bin
+%{_datadir}/scim/tables/CNS11643.bin
 %{_datadir}/scim/tables/CangJie*.bin
 %{_datadir}/scim/tables/Cantonese.bin
 %{_datadir}/scim/tables/CantonHK.bin
@@ -258,8 +284,9 @@
 %{_datadir}/scim/tables/Wu.bin
 %{_datadir}/scim/tables/Wubi.bin
 %{_datadir}/scim/tables/Ziranma.bin
-%{_datadir}/scim/tables/ZhuYin.bin
+%{_datadir}/scim/tables/ZhuYin*.bin
 %{_datadir}/scim/icons/Array30.png
+%{_datadir}/scim/icons/CNS11643.png
 %{_datadir}/scim/icons/CangJie*.png
 %{_datadir}/scim/icons/Cantonese.png
 %{_datadir}/scim/icons/CantonHK.png
@@ -277,6 +304,7 @@
 %{_datadir}/scim/icons/ZhuYin.png
 
 
+%if %{indic_tables}
 %files gujarati
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -285,7 +313,6 @@
 %{_datadir}/scim/icons/Gujarati-inscript.png
 %{_datadir}/scim/icons/Gujarati-phonetic.png
 
-
 %files hindi
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -293,7 +320,7 @@
 %{_datadir}/scim/tables/Hindi-phonetic.bin
 %{_datadir}/scim/icons/Hindi-inscript.png
 %{_datadir}/scim/icons/Hindi-phonetic.png
-
+%endif
 
 %if %{jk_tables}
 %files japanese
@@ -309,6 +336,7 @@
 %endif
 
 
+%if %{indic_tables}
 %files kannada
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -316,7 +344,7 @@
 %{_datadir}/scim/tables/Kannada-kgp.bin
 %{_datadir}/scim/icons/Kannada-inscript.png
 %{_datadir}/scim/icons/Kannada-kgp.png
-
+%endif
 
 %if %{jk_tables}
 %files korean
@@ -330,12 +358,13 @@
 %endif
 
 
+%if %{indic_tables}
 %files malayalam
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Malayalam-inscript.bin
 %{_datadir}/scim/icons/Malayalam-inscript.png
-
+%endif
 
 %files nepali
 %defattr(-, root, root, -)
@@ -344,6 +373,7 @@
 %{_datadir}/scim/icons/Nepali.png
 
 
+%if %{indic_tables}
 %files punjabi
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -353,6 +383,7 @@
 %{_datadir}/scim/icons/Punjabi-inscript.png
 %{_datadir}/scim/icons/Punjabi-jhelum.png
 %{_datadir}/scim/icons/Punjabi-phonetic.png
+%endif
 
 
 %files russian
@@ -362,6 +393,7 @@
 %{_datadir}/scim/icons/Yawerty.png
 
 
+%if %{indic_tables}
 %files tamil
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
@@ -369,6 +401,7 @@
 %{_datadir}/scim/tables/Tamil-phonetic.bin
 %{_datadir}/scim/icons/Tamil-inscript.png
 %{_datadir}/scim/icons/Tamil-phonetic.png
+%endif
 
 
 %files thai
@@ -378,11 +411,13 @@
 %{_datadir}/scim/icons/Thai.png
 
 
+%if %{indic_tables}
 %files telugu
 %defattr(-, root, root, -)
 %dir %{_datadir}/scim/tables
 %{_datadir}/scim/tables/Telugu-inscript.bin
 %{_datadir}/scim/icons/Telugu-inscript.png
+%endif
 
 
 %files vietnamese
@@ -402,23 +437,37 @@
 
 
 %changelog
-* Mon Dec 26 2005 Jens Petersen <petersen at redhat.com> - 0.5.5-1%{?dist}
+* Thu May  4 2006 Jens Petersen <petersen at redhat.com> - 0.5.6-1.fc4
+- obsolete old scim-tables-{japanese,korean} subpackages (Michael Schwendt)
+
+* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com>
+- add %%indic_tables build switch
+
+* Thu Feb  9 2006 Jens Petersen <petersen at redhat.com>
+- update filelist since moduledir is now api-versioned
+
+* Fri Jan 13 2006 Jens Petersen <petersen at redhat.com>
+- update to 0.5.6 release
+  - update tables-skip-ja-ko.patch
+  - updates filelist for chinese tables
+
+* Mon Dec 26 2005 Jens Petersen <petersen at redhat.com> - 0.5.5-1.fc4
 - update to 0.5.5
   - update filelists
-- remove the Japanese and Korean tables and subpackages with
+- remove the Japanese and Korean tables and their 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}
+* Wed Dec 1 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.4-1.fc4
 - update to 0.5.4
 
-* Tue Oct 18 2005 Jens Petersen <petersen at redhat.com> - 0.5.3-6%{?dist}
+* Tue Oct 18 2005 Jens Petersen <petersen at redhat.com> - 0.5.3-6.fc4
 - update to cvs head to fix various table issues with
   scim-tables-cvs-20051018.patch
 
-* Fri Oct  7 2005 Jens Petersen <petersen at redhat.com> - 0.5.3-5%{?dist}
+* Fri Oct  7 2005 Jens Petersen <petersen at redhat.com> - 0.5.3-5.fc4
 - require scim
 
-* Thu Sep 22 2005 Jens Petersen <petersen at redhat.com> - 0.5.3-4%{?dist}
+* Thu Sep 22 2005 Jens Petersen <petersen at redhat.com> - 0.5.3-4.fc4
 - add a Thai table derived from m17n-db with a Thai icon
 - separate the Indic tables and the additional language tables into separate
   language subpackages


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tables/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Dec 2005 06:38:59 -0000	1.5
+++ sources	4 May 2006 09:26:57 -0000	1.6
@@ -1 +1 @@
-15da0323195dea92690d4b391665b95a  scim-tables-0.5.5.tar.gz
+ff8d59e8f3dedb7dd7c6d87c8fc408db  scim-tables-0.5.6.tar.gz


