rpms/ibus-table-cangjie/devel ibus-table-cangjie.spec,1.39,1.40

[kaio]

Author: kaio

Update of /cvs/pkgs/rpms/ibus-table-cangjie/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29977

Modified Files:
	ibus-table-cangjie.spec 
Log Message:
* Sat Apr 03 2010 Caius 'kaio' Chance <cchance at redhat.com> - 1.2.0.20100210-17
- Change Conflicts: into Provides:.



Index: ibus-table-cangjie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-table-cangjie/devel/ibus-table-cangjie.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ibus-table-cangjie.spec	8 Mar 2010 01:07:05 -0000	1.39
+++ ibus-table-cangjie.spec	2 Apr 2010 15:17:16 -0000	1.40
@@ -1,6 +1,8 @@
+%define old_ver 1.2.0.20100210
+
 Name:       ibus-table-cangjie
 Version:    1.2.0.20100210
-Release:    16%{?dist}
+Release:    17%{?dist}
 Summary:    Cang Jie and derived tables for IBus-Table
 License:    GPLv3
 Group:      System Environment/Libraries
@@ -13,8 +15,8 @@ BuildArch:  noarch
 Requires:         ibus-table >= 1.2.0.20100111-2
 BuildRequires:    ibus-table-devel >= 1.2.0.20100111-4
 
-Obsoletes:        ibus-table-quick <= 1.2.0.20100106, ibus-table-easy <= 1.2.0.20100106
-Conflicts:        ibus-table-quick >  1.2.0.20100106, ibus-table-easy >  1.2.0.20100106
+Obsoletes:        ibus-table-quick <= %{old_ver}, ibus-table-easy <= %{old_ver}
+Provides:         ibus-table-quick == %{old_ver}, ibus-table-easy == %{old_ver}
 
 %description
 The package contains Cang Jie and derived tables for IBus-Table, namely Cang 
@@ -75,6 +77,9 @@ cd %{buildroot}/%{_datadir}/ibus-table/t
 %{_datadir}/ibus-table/icons/easy-big.png
 
 %changelog
+* Sat Apr 03 2010 Caius 'kaio' Chance <cchance at redhat.com> - 1.2.0.20100210-17
+- Change Conflicts: into Provides:.
+
 * Mon Mar 08 2010 Caius 'kaio' Chance <cchance at redhat.com> - 1.2.0.20100210-16
 - Changed to noarch.