rpms/scim-bridge/devel scim-bridge.spec,1.59,1.60

[Huang Peng (phuang)]

Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14182

Modified Files:
	scim-bridge.spec 
Log Message:
Add Obsoletes for resloving yum update problem.



Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- scim-bridge.spec	2 Apr 2008 02:44:34 -0000	1.59
+++ scim-bridge.spec	2 Apr 2008 23:40:04 -0000	1.60
@@ -4,8 +4,13 @@
 %define build_qt 1
 
 Name:           scim-bridge
+
+Obsoletes:      scim-bridge-qt < %{version}-%{release}
+Obsoletes:      scim-bridge-qt4 < %{version}-%{release}
+
+Epoch:		1
 Version:        0.4.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -22,7 +27,6 @@
 Buildrequires:  autoconf, automake, libtool
 %endif
 Requires:       scim >= 1.4.6
-
 Patch0:         scim-bridge-0.4.15-fix-gdm.patch
 Patch1:         scim-bridge-0.4.15-hotkey-help.patch
 
@@ -38,7 +42,7 @@
 Requires(post): gtk2 >= 2.9.1-2
 Requires(postun): gtk2 >= 2.9.1-2
 # need %{_bindir}/scim-bridge
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:  scim-bridge-gtkimm < 0.4.2
 
 %description gtk
@@ -50,17 +54,23 @@
 Summary:    SCIM Bridge Qt IM module
 Group:      System Environment/Libraries
 # need %{_bindir}/scim-bridge
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Obsoletes:  scim-bridge-qtimm < 0.4.2
+Obsoletes:  scim-bridge-qt4 < %{version}-%{release}
+Provides:   scim-bridge-qt4 = %{version}-%{release}
 
 %description qt
 This package provides the SCIM Bridge Qt input method module.
 
 %package qt3
-Summary:    SCIM Bridge Qt4 IM module
+Summary:    SCIM Bridge Qt3 IM module
 Group:      System Environment/Libraries
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
 Obsoletes:  scim-bridge-qtimm < 0.4.2
+Obsoletes:  scim-bridge-qt < %{version}-%{release}
+Provides:   scim-bridge-qt = %{version}-%{release}
 
 %description qt3
 This package provides the SCIM Bridge Qt3 input method module.
@@ -143,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 03 2008 Huang Peng <phuang at redhat.com> -0.4.15-4
+- Add Obsoletes for resloving yum update problem.
+
 * Wed Apr 02 2008 Huang Peng <phuang at redhat.com> -0.4.15-3
 - Rename scim-bridge-qt to scim-bridge-qt3 and 
   rename scim-bridge-qt4 to scim-bridge-qt to fix bug 440174.