Merge branch 'master' into f22

.gitignore

@@ -6,3 +6,4 @@
 /v1.3.20.tar.gz
 /v1.3.21.tar.gz
 /v1.3.22.tar.gz
+/v1.4.0.tar.gz

sources

@@ -1 +1 @@
-cc4d32f4968236d5e6bf925653884d7f  v1.3.22.tar.gz
+edf01427031321d71f540ea6e46e40ef  v1.4.0.tar.gz

zanata-python-client.spec

@@ -1,12 +1,13 @@
+%{!?__python2: %define __python2 %{__python}}
+%{!?python2_sitelib: %define python2_sitelib %{python_sitelib}}
 Name: zanata-python-client
-Version: 1.3.22
+Version: 1.4.0
 Release: 1%{?dist}
 Summary: Python Client for Zanata Server
 License: LGPLv2+
 URL: http://zanata.org
 Source0: https://github.com/zanata/zanata-python-client/archive/v%{version}.tar.gz
 
-
 BuildArch: noarch
 BuildRequires: python-setuptools
 Requires: python-polib >= 1.0.0-1
@@ -16,7 +17,7 @@ Requires: python-hashlib
 Requires: python-simplejson
 %endif
 
-Conflicts: python-json
+#Conflicts: python-json
 BuildRequires: python2-devel
 
 Provides:       flies-python-client = %{version}-%{release}
@@ -37,12 +38,27 @@ cp -pr zanataclient/VERSION-FILE build/lib/zanataclient
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
 
 %files
+%defattr(-,root,root,-)
 %doc README.rst COPYING.LESSER zanata.ini CHANGELOG
-%{python2_sitelib}/*
 %{_bindir}/*
+%{python2_sitelib}
 
 
 %changelog
+* Thu Dec 10 2015 Ding-Yi Chen <dchen@redhat.com> - 1.4.0-1
+- Upsteam update to 1.4.0 which fixed:
+  - Bug 1215274 - specify minimum percentage completion on pull
+  - Rename zanatalib/project.py to zanatalib/projectutils.py
+  - Bug 1156236 - use locale aliases defined in the server
+  - added ProjectContext, Improved help, fixed code issues
+  - added <src-dir> and <trans-dir> in zanata.xml
+  - refactor code - added config to centralize rest resources
+  - Organize exception messages, added test.
+  - HTTP to HTTPS redirect - auto, if found in httplib2 response
+  - Rename zanatalib/client.py to zanatalib/resource.py
+  - flake8 changes and addition of: make flake8
+  - added requirements.txt
+
 * Mon Jul 27 2015 Anish Patil <anish.developer@gmail.com> - 1.3.22-1
 - Upstream has released new version