From d9c99dcd92fa2bf0b51a538353e775629baaed7e Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Jan 21 2016 00:37:12 +0000
Subject: Merge branch 'el6'


Conflicts:
	zanata-python-client.spec

---

diff --git a/zanata-python-client.spec b/zanata-python-client.spec
index bf2b33c..f039de6 100644
--- a/zanata-python-client.spec
+++ b/zanata-python-client.spec
@@ -1,8 +1,8 @@
-%{!?__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: 3%{?dist}
+Release: 4%{?dist}
 Summary: Python Client for Zanata Server
 License: LGPLv2+
 Group:   Applications/Text
@@ -51,13 +51,15 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %{python2_sitelib}
 
-
 %changelog
+* 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: