Merge branch 'master' into f23

.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,12 +1,13 @@
-%{!?__python2: %define __python2 %{__python}}
-%{!?python2_sitelib: %define python2_sitelib %{python_sitelib}}
+%{!?__python2: %global __python2 %{__python}}
+%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}}
 Name: zanata-python-client
-Version: 1.4.1
-Release: 2%{?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
@@ -15,8 +16,9 @@ Requires: python-httplib2 >= 0.7.4-6
 
 %if 0%{?rhel}
     %if 0%{?rhel} < 6
-        Requires: python-hashlib
-        Requires: python-simplejson
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires:  python-hashlib
+Requires:  python-simplejson
     %endif
 %endif
 
@@ -30,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
@@ -40,16 +42,27 @@ cp -pr zanataclient/VERSION-FILE build/lib/zanataclient
 %{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
 
+%clean
+rm -rf %{buildroot}
+
 %files
 %defattr(-,root,root,-)
 %doc README.rst COPYING.LESSER zanata.ini CHANGELOG
 %{_bindir}/*
 %{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.
+
+* Thu Jan 14 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.1-3
+Fix the EPEL5 build.
+
 * Thu Jan 14 2016 Ding-Yi Chen <dchen@redhat.com> - 1.4.1-2
-Fix the Fedora 22 rpmlint error.
+- 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: