Merge branch 'master' into el6

Conflicts:
	zanata-python-client.spec

.gitignore

@@ -8,3 +8,4 @@
 /v1.3.22.tar.gz
 /v1.4.0.tar.gz
 /zpc-v1.4.1.tar.gz
+/v1.4.2.tar.gz

sources

@@ -1 +1 @@
-077fee479e135c3d61098c6edb47e27a  zpc-v1.4.1.tar.gz
+c7fa0b97a4612192edb7a2b4b2da0ea5  v1.4.2.tar.gz

zanata-python-client.spec

@@ -1,13 +1,13 @@
 %{!?__python2: %global __python2 %{__python}}
 %{!?python2_sitelib: %global python2_sitelib %{python_sitelib}}
 Name: zanata-python-client
-Version: 1.4.1
-Release: 4%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
 Summary: Python Client for Zanata Server
 License: LGPLv2+
 Group:   Applications/Text
 URL: http://zanata.org
-Source0: https://github.com/zanata/zanata-python-client/archive/zpc-v%{version}.tar.gz
+Source0: https://github.com/zanata/zanata-python-client/archive/v%{version}.tar.gz
 
 BuildArch: noarch
 BuildRequires: python-setuptools
@@ -32,7 +32,7 @@ Obsoletes:      flies-python-client < 1.1
 Zanata Python client is a client that communicate with Zanata server.
 
 %prep
-%setup -q -n zanata-python-client-zpc-v%{version}
+%setup -q -n %{name}-%{version}
 
 %build
 %{__python2} setup.py build
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
 %{python2_sitelib}
 
 %changelog
+* Thu Jan 21 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.2-1
+- Upstream update to 1.4.2
+
 * Wed Jan 20 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.4.1-4
 - Change define -> global to fix build issue with epel-rpm-macros.