rpms/scim/devel scim.spec,1.3,1.4 xinput-scim,1.1,1.2

[Ryo Dairiki (ryo)]

Author: ryo

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4400

Modified Files:
	scim.spec xinput-scim 
Log Message:
Remove one of doubled capplets.



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim.spec	28 May 2005 01:35:21 -0000	1.3
+++ scim.spec	20 Jun 2005 14:39:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      scim
 Version:   1.2.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -56,6 +56,9 @@
   --add-category X-Fedora                               \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/scim-setup.desktop
 
+# remove capplet
+rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
+
 # install user manual
 mkdir -p docs/dist/manual/zh_CN/figures/
 cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/
@@ -120,7 +123,6 @@
 %{_datadir}/scim
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-scim-setup.desktop
-%{_datadir}/control-center-2.0/capplets/scim-setup.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -132,7 +134,10 @@
 
 
 %changelog
-* Sat May 28 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 1.2.3-1
+* Mon Jun 20 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 1.2.3-2
+- Remove one of doubled capplets for setup.
+
+* Sat May 28 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 1.2.3-1
 - Update packaging for Fedora Extras
 
 * Fri Mar 13 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 1.2.2-9


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinput-scim	19 May 2005 08:12:37 -0000	1.1
+++ xinput-scim	20 Jun 2005 14:39:21 -0000	1.2
@@ -3,3 +3,4 @@
 XIM_PROGRAM=scim
 XIM_ARGS="-d"
 GTK_IM_MODULE=scim
+QT_IM_MODULES=scim