[zanata-python-client/f13] Change to version 1.2.5

[james ni]

commit 6d5d6d48860d502f62911676554aab1e4dc5f03a
Author: James Ni <kent.neo at gmail.com>
Date:   Wed Jun 1 13:44:53 2011 +0800

    Change to version 1.2.5

 .gitignore                |    1 +
 sources                   |    2 +-
 zanata-python-client.spec |    6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f31ca2..b8a2beb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /zanata-python-client-1.2.2.tar.gz
 /zanata-python-client-1.2.3.tar.gz
 /zanata-python-client-1.2.4.tar.gz
+/zanata-python-client-1.2.5.tar.gz
diff --git a/sources b/sources
index b490932..0970f41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d66dc8254170d4ac86a496c261cabbb  zanata-python-client-1.2.4.tar.gz
+4d140a61b6fd47ef694383d1101b5ec4  zanata-python-client-1.2.5.tar.gz
diff --git a/zanata-python-client.spec b/zanata-python-client.spec
index 7cbc5fe..9e30e7a 100644
--- a/zanata-python-client.spec
+++ b/zanata-python-client.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: zanata-python-client
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 Summary: Python Client for Zanata Server
 
@@ -15,6 +15,7 @@ BuildArch: noarch
 BuildRequires: python-setuptools
 Requires: python-polib
 Requires: python-httplib2
+Conflicts: python-json
 %if 0%{?fedora} < 13
 BuildRequires: python-devel
 %endif
@@ -45,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Wed Jun 01 2011 James Ni <jni at redhat.com> - 1.2.5-1
+- Bug fix and usability improvement
+
 * Thu May 05 2011 James Ni <jni at redhat.com> - 1.2.4-1
 - Fix rhbz#702192