rpms/scim/FC-3 scim.spec,1.15,1.16

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim.spec 
Log Message:
sync with FC-4:
- move libs and the gtk immodule to scim-libs for multilib
- make scim-devel require scim-libs
- add xinput.d entries for Indic langs



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim.spec	9 Sep 2005 06:39:54 -0000	1.15
+++ scim.spec	22 Sep 2005 02:58:41 -0000	1.16
@@ -1,7 +1,7 @@
 Name:      scim
 Version:   1.4.2
 # must be less than the release number of scim in Core
-Release:   1%{?dist}
+Release:   3%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -26,7 +26,7 @@
 %package devel
 Summary:    Smart Common Input Method platform
 Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-libs = %{version}-%{release}
 Requires:   gtk2-devel
 
 %description devel
@@ -36,12 +36,20 @@
 
 %package doc
 Summary:    Smart Common Input Method platform documentation
-Group:      Development/Libraries
+Group:      Documentation
 
 %description doc
 SCIM development documentation files generated from the sourcecode.
 
 
+%package libs
+Summary:    Smart Common Input Method libraries
+Group:      System Environment/Libraries
+
+%description libs
+This package provides the libraries and GTK input method module for SCIM.
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .1-restart
@@ -51,6 +59,7 @@
 
 
 %build
+# symbol versioning enabled for FC3 and RHEL4
 %configure --disable-static --enable-ld-version-script
 make %{?_smp_mflags}
 
@@ -85,11 +94,14 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%define cjk_langs ja_JP ko_KR zh_CN zh_TW
+%define indic_langs bn_IN gu_IN hi_IN kn_IN ml_IN pa_IN ta_IN te_IN
+%define supported_langs %{cjk_langs} %{indic_langs} ne_NE th_TH
 
 %post
 /sbin/ldconfig
 
-for llcc in ja_JP ko_KR zh_CN zh_TW; do
+for llcc in %{supported_langs}; do
    %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim 81
 done
 
@@ -100,7 +112,7 @@
 /sbin/ldconfig
 
 if [ "$1" = "0" ]; then
-   for llcc in ja_JP ko_KR zh_CN zh_TW; do
+   for llcc in %{supported_langs}; do
       %{_sbindir}/alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim
       # if alternative was set to manual scim, reset to auto
       [ "`readlink %{_sysconfdir}/alternatives/xinput-$llcc`" = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] && %{_sbindir}/alternatives --auto xinput-$llcc
@@ -117,9 +129,7 @@
 %config(noreplace) %{_sysconfdir}/scim/*
 %{_sysconfdir}/X11/xinit/xinput.d
 %{_bindir}/*
-%{_libdir}/libscim*.so.*
 %{_libdir}/scim-1.0
-%{_libdir}/gtk-2.0/immodules
 %{_datadir}/scim
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-scim-setup.desktop
@@ -135,8 +145,20 @@
 %defattr(-,root,root,-)
 %doc docs/html
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libscim-*.so.*
+%{_libdir}/gtk-2.0/immodules
+
 
 %changelog
+* Thu Sep 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-3
+- make scim-devel require scim-libs
+- add xinput.d entries for Indic langs
+
+* Thu Sep 15 2005 Jens Petersen <petersen at redhat.com>
+- move libs and the gtk immodule to scim-libs for multilib
+
 * Fri Sep  9 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-1
 - improve scim-restart script to take account of the config module in use
   (Liu Cougar)
@@ -148,7 +170,7 @@
   for now so that rhgb doesn't load scim (Warren Togami, #167088)
 
 * Thu Aug 25 2005 Warren Togami <wtogami at redhat.com>
-- --enable-ld-version-script
+- configure with --enable-ld-version-script (#166041)
 
 * Mon Aug 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-0
 - update to 1.4.2 release