rpms/scim/FC-4 scim.spec,1.23,1.24

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim.spec 
Log Message:
- avoid errors in postun script when uninstalling
- suffix %dist to ver-rel tags in changelog



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scim.spec	7 Oct 2005 06:57:51 -0000	1.23
+++ scim.spec	2 Nov 2005 08:45:33 -0000	1.24
@@ -1,7 +1,7 @@
 Name:      scim
 Version:   1.4.2
 # must be less than the release number of scim in Core
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -113,9 +113,9 @@
 %postun
 if [ "$1" = "0" ]; then
    for llcc in %{supported_langs}; do
-      %{_sbindir}/alternatives --remove xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim
+      %{_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
+      [ -L %{_sysconfdir}/alternatives/xinput-$llcc -a "`readlink %{_sysconfdir}/alternatives/xinput-$llcc`" = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] && %{_sbindir}/alternatives --auto xinput-$llcc || :
    done
 fi
 
@@ -154,18 +154,21 @@
 
 
 %changelog
-* Thu Oct  6 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-4
+* Tue Nov  1 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-5%{?dist}
+- avoid errors with postun script when uninstalling
+
+* Thu Oct  6 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-4%{?dist}
 - fixing quoting in scim-restart
 - make post and postun scripts for scim-libs
 
-* Thu Sep 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-3
+* Thu Sep 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-3%{?dist}
 - 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
+* Fri Sep  9 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-1%{?dist}
 - improve scim-restart script to take account of the config module in use
   (Liu Cougar)
 
@@ -175,7 +178,7 @@
 - add scim-gtk-langs-167090.patch to set gtk immodule language list empty
   for now so that rhgb doesn't load scim (Warren Togami, #167088)
 
-* Mon Aug 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-0
+* Mon Aug 22 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-0%{?dist}
 - update to 1.4.2 release
 - source scim-qtimm script if present from scim xinput script
 - reduce xinput.d alternatives priority to 81