Merge branch 'master' into f23

.gitignore

@@ -9,3 +9,4 @@
 /v1.4.0.tar.gz
 /zpc-v1.4.1.tar.gz
 /v1.4.2.tar.gz
+/v1.5.0.tar.gz

sources

@@ -1 +1 @@
-c7fa0b97a4612192edb7a2b4b2da0ea5  v1.4.2.tar.gz
+b48962a5930e55f464b81caa96311229  v1.5.0.tar.gz

zanata-python-client.spec

@@ -1,8 +1,8 @@
 %{!?__python2: %global __python2 %{__python}}
 %{!?python2_sitelib: %global python2_sitelib %{python_sitelib}}
 Name: zanata-python-client
-Version: 1.4.2
-Release: 1%{?dist}
+Version: 1.5.0
+Release: 2%{?dist}
 Summary: Python Client for Zanata Server
 License: LGPLv2+
 Group:   Applications/Text
@@ -13,12 +13,14 @@ BuildArch: noarch
 BuildRequires: python-setuptools
 Requires: python-polib >= 1.0.0-1
 Requires: python-httplib2 >= 0.7.4-6
+Requires: python-lxml
 
 %if 0%{?rhel}
     %if 0%{?rhel} < 6
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:  python-hashlib
 Requires:  python-simplejson
+Requires:  python-ordereddict
     %endif
 %endif
 
@@ -47,11 +49,28 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README.rst COPYING.LESSER zanata.ini CHANGELOG
+%doc README.rst COPYING.LESSER zanata.ini zanata_example.xml CHANGELOG
 %{_bindir}/*
 %{python2_sitelib}
 
 %changelog
+* Fri Apr 15 2016 Sundeep Anand <suanand@redhat.com> - 1.5.0-2
+- add build requires, v1.5.0 release notes:
+  - Bug 1139950 - Translation files mapping rules
+  - Bug 1311705 - traceback when trying to push
+  - ZNTA-303 - podir projects handling
+  - ZNTA-927 - Project Status and Versions
+  - ZNTA-929 - failed to retrieve version in non-git environment
+  - ZNTA-934 - init failed to generate java-client compatible zanata.xml
+  - ZNTA-936 - error message for unexpected html response
+  - ZNTA-946 - Cannot push with zanata Python client 1.4.2
+
+* Fri Apr 15 2016 Ding-Yi Chen <dchen@redhat.com> - 1.5.0-1
+- Upstream update to 1.5.0-1
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Thu Jan 21 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.2-1
 - Upstream update to 1.4.2