Merge branch 'master' into el6

.gitignore

@@ -1,22 +1,9 @@
-/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
-/zanata-python-client-1.2.6.tar.gz
-/zanata-python-client-1.3.0.tar.gz
-/zanata-python-client-1.3.1.tar.gz
-/zanata-python-client-1.3.2.tar.gz
-/zanata-python-client-1.3.3.tar.gz
-/zanata-python-client-1.3.4.tar.gz
-/zanata-python-client-1.3.5.tar.gz
-/zanata-python-client-1.3.6.tar.gz
-/zanata-python-client-1.3.7.tar.gz
-/zanata-python-client-1.3.8.tar.gz
-/zanata-python-client-1.3.10.tar.gz
-/zanata-python-client-1.3.11.tar.gz
-/zanata-python-client-1.3.12.tar.gz
-/zanata-python-client-1.3.13.tar.gz
+/1.3.14.tar.gz
+/v1.3.15.tar.gz
 /v1.3.16.tar.gz
+/v1.3.18.tar.gz
+/v1.3.19.tar.gz
 /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}
@@ -29,29 +30,47 @@ Zanata Python client is a client that communicate with Zanata server.
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 cp -pr zanataclient/VERSION-FILE build/lib/zanataclient
 
 %install
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
 
 %files
+%defattr(-,root,root,-)
 %doc README.rst COPYING.LESSER zanata.ini CHANGELOG
-%{python_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
 
-* Tue Mar 3 2015 Anish Patil <apatil@redhat.com> - 1.3.21-1
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Mar 03 2015 Anish Patil <apatil@redhat.com> - 1.3.21-1
 - Upstream has released new version
 
-* Mon Mar 2 2015 Anish Patil <apatil@redhat.com> - 1.3.20-1
+* Mon Mar 02 2015 Anish Patil <apatil@redhat.com> - 1.3.20-1
 - Upstream has released new version
-- Use a el6 compatible python macro by Robert Mayr <robyduck@fedoraproject.org>
 
 * Mon Feb 23 2015 Anish Patil <apatil@redhat.com> - 1.3.19-1
 - Upstream has released new version