rpms/scim-anthy/FC-4 scim-anthy.spec,1.10,1.11

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim-anthy.spec 
Log Message:
- prereq scim xinput.d script
- count scim-ja_JP providers before removing xinput.d alternative



Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scim-anthy.spec	29 Jul 2005 14:31:26 -0000	1.10
+++ scim-anthy.spec	29 Jul 2005 23:26:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           scim-anthy
 Version:        0.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SCIM IMEngine for anthy for Japanese input
 
 Group:          System Environment/Libraries
@@ -12,6 +12,8 @@
 Provides:       scim-ja_JP
 Requires:       anthy
 BuildRequires:  scim-devel anthy-devel
+# for alternatives in install scripts
+PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim
 
 %description
 Scim-anthy is a SCIM IMEngine module for anthy to support Japanese input.
@@ -40,22 +42,18 @@
 
 
 %post
-%{_sbindir}/alternatives --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP /etc/X11/xinit/xinput.d/scim 90
+%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ja_JP xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim 85
 
 
 %postun
-if [ "$1" = 0 ]
-then
-	if ! rpm -q --whatprovides scim-ja_JP
-	then
-		%{_sbindir}/alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/scim
-		if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ]
-		then
-			%{_sbindir}/alternatives --auto xinput-ja_JP
-		fi
-	fi
+if [ "$1" = "0"  -a `rpm -q --whatprovides scim-ja_JP 2>/dev/null | wc -l` = 1 ]; then
+   %{_sbindir}/alternatives --remove xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim
+   if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ]; then
+      %{_sbindir}/alternatives --auto xinput-ja_JP
+   fi
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
@@ -64,9 +62,17 @@
 
 
 %changelog
+* Fri Jul 29 2005 Jens Petersen <petersen at redhat.com>
+- prereq scim xinput.d script
+- count scim-ja_JP providers before removing xinput.d alternative
+
+* Fri Jul 29 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com>
+- add xinput.d alternatives setup in %%post and %%postun
+- provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if
+  no other scim-ja_JP left
+
 * Fri Jul 29 2005 Jens Petersen <petersen at redhat.com> - 0.5.3-1
 - update to 0.5.3 release
-- add xinput-scim entry (Ryo Diairki)
 
 * Tue Jul 26 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 0.5.2-1
 - update to 0.5.2 release