Merge branch 'master' into epel7

.gitignore

@@ -7,3 +7,4 @@
 /v1.3.21.tar.gz
 /v1.3.22.tar.gz
 /v1.4.0.tar.gz
+/zpc-v1.4.1.tar.gz

sources

@@ -1 +1 @@
-edf01427031321d71f540ea6e46e40ef  v1.4.0.tar.gz
+077fee479e135c3d61098c6edb47e27a  zpc-v1.4.1.tar.gz

zanata-python-client.spec

@@ -1,20 +1,23 @@
 %{!?__python2: %define __python2 %{__python}}
 %{!?python2_sitelib: %define python2_sitelib %{python_sitelib}}
 Name: zanata-python-client
-Version: 1.4.0
-Release: 1%{?dist}
+Version: 1.4.1
+Release: 2%{?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
+Source0: https://github.com/zanata/zanata-python-client/archive/zpc-v%{version}.tar.gz
 
 BuildArch: noarch
 BuildRequires: python-setuptools
 Requires: python-polib >= 1.0.0-1
 Requires: python-httplib2 >= 0.7.4-6
-%if 0%{?rhel} < 6
-Requires: python-hashlib
-Requires: python-simplejson
+
+%if 0%{?rhel}
+    %if 0%{?rhel} < 6
+        Requires: python-hashlib
+        Requires: python-simplejson
+    %endif
 %endif
 
 #Conflicts: python-json
@@ -27,7 +30,7 @@ Obsoletes:      flies-python-client < 1.1
 Zanata Python client is a client that communicate with Zanata server.
 
 %prep
-%setup -q
+%setup -q -n zanata-python-client-zpc-v%{version}
 
 %build
 %{__python2} setup.py build
@@ -46,6 +49,18 @@ rm -rf $RPM_BUILD_ROOT/%{_docdir}
 
 
 %changelog
+* Thu Jan 14 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.1-2
+Fix the Fedora 22 rpmlint error.
+
+* Wed Jan 13 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.1-1
+- Upsteam update to 1.4.1 which fixed:
+  * Improvements
+    - zanata init Initialize Zanata project configuration
+    - zanata stats Displays translation statistics for a Zanata project version
+  * Bug fixes
+    - Bug 1206995 - Should allow anonymous pull from Zanata
+    - Bug ZNTA-853 - Crash when pushing local translations
+
 * 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