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

[Huang Peng (phuang)]

Author: phuang

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

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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- scim-bridge.spec	2 Apr 2008 23:40:04 -0000	1.60
+++ scim-bridge.spec	3 Apr 2008 05:35:27 -0000	1.61
@@ -5,10 +5,6 @@
 
 Name:           scim-bridge
 
-Obsoletes:      scim-bridge-qt < %{version}-%{release}
-Obsoletes:      scim-bridge-qt4 < %{version}-%{release}
-
-Epoch:		1
 Version:        0.4.15
 Release:        4%{?dist}
 Summary:        SCIM Bridge Gtk IM module
@@ -42,7 +38,7 @@
 Requires(post): gtk2 >= 2.9.1-2
 Requires(postun): gtk2 >= 2.9.1-2
 # need %{_bindir}/scim-bridge
-Requires:   %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
 Obsoletes:  scim-bridge-gtkimm < 0.4.2
 
 %description gtk
@@ -54,11 +50,10 @@
 Summary:    SCIM Bridge Qt IM module
 Group:      System Environment/Libraries
 # need %{_bindir}/scim-bridge
-Requires:   %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
 
 Obsoletes:  scim-bridge-qtimm < 0.4.2
-Obsoletes:  scim-bridge-qt4 < %{version}-%{release}
-Provides:   scim-bridge-qt4 = %{version}-%{release}
+Obsoletes:  scim-bridge-qt4
 
 %description qt
 This package provides the SCIM Bridge Qt input method module.
@@ -66,11 +61,11 @@
 %package qt3
 Summary:    SCIM Bridge Qt3 IM module
 Group:      System Environment/Libraries
-Requires:   %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
 
 Obsoletes:  scim-bridge-qtimm < 0.4.2
-Obsoletes:  scim-bridge-qt < %{version}-%{release}
-Provides:   scim-bridge-qt = %{version}-%{release}
+Obsoletes:  scim-bridge-qt <= 0.4.15-2
+Provides:   scim-bridge-qt = 0.4.15-2
 
 %description qt3
 This package provides the SCIM Bridge Qt3 input method module.