From 0795b1d7b1ca6a5373630dc8d82bc13e63bc9585 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Jan 15 2016 03:51:58 +0000
Subject: Merge branch 'master' into epel7


---

diff --git a/macros.python b/macros.python
index 89cd845..0a7ed0a 100644
--- a/macros.python
+++ b/macros.python
@@ -33,9 +33,9 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
                 print(string.sub(package,9,string.len(package)));\
                 print(" < ");\
                 print(vr);\
-        elseif (string.starts(str, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then\
+        elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then\
                 --No unversioned provides as python3 is not default\
-        elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(str, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then\
+        elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(package, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then\
                 --No unversioned provides as python3_other is not default\
         elseif (string.starts(package, "pypy-")) then\
                 --No unversioned provides as pypy is not default\
@@ -48,8 +48,8 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
                 print(" = ");\
                 print(vr);\
         else\
-                print("ERROR: ");\
+                print("%python_provide: ERROR: ");\
                 print(package);\
-                print("not recognized.");\
+                print(" not recognized.");\
         end\
 }
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index d40d597..b703fcb 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           python-rpm-macros
 Version:        3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The unversioned Python RPM macros
 
 License:        MIT
@@ -61,6 +61,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \
 
 
 %changelog
+* Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-6
+- Fix typo in %%python_provide
+
 * Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> 3-5
 - Handle noarch python sub-packages (bug #1290900)