From 7b16d496b8a43e6ec6b005e5cd97a86decf71d7d Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Nov 13 2015 14:29:56 +0000
Subject: Tenuous support for python34 on epel7.


---

diff --git a/python-kitchen.spec b/python-kitchen.spec
index d22e0c8..fe1d9d1 100644
--- a/python-kitchen.spec
+++ b/python-kitchen.spec
@@ -6,12 +6,16 @@
 
 
 %if 0%{?fedora}
+# Move this out of the conditional to really support python34 on epel7.
 %global with_python3 1
+%{!?python3_pkgversion: %global python3_pkgversion 3}
+%else
+%{!?python3_pkgversion: %global python3_pkgversion 34}
 %endif
 
 Name:           python-kitchen
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Small, useful pieces of code to make python coding easier
 
 Group:          Development/Languages
@@ -42,11 +46,13 @@ Requires: python-chardet
 %endif
 
 %if 0%{?with_python3}
-BuildRequires:  python3-devel
-BuildRequires:  python3-nose
-BuildRequires:  python3-test
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-chardet
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-nose
+BuildRequires:  python%{python3_pkgversion}-test
+BuildRequires:  python%{python3_pkgversion}-chardet
+%if 0%{?fedora}
+BuildRequires:  python%{python3_pkgversion}-sphinx
+%endif
 %endif
 
 %description
@@ -70,24 +76,24 @@ This package contains the API documenation for programming with the
 python-2 version of the kitchen library.
 
 %if 0%{?with_python3}
-%package -n python3-kitchen
+%package -n python%{python3_pkgversion}-kitchen
 Summary:    Small, useful pieces of code to make python 3 coding easier
 Group:      Development/Languages
 
-Requires:   python3
-Requires:   python3-chardet
+Requires:   python%{python3_pkgversion}
+Requires:   python%{python3_pkgversion}-chardet
 
-%description -n python3-kitchen
+%description -n python%{python3_pkgversion}-kitchen
 kitchen includes functions to make gettext easier to use, handling unicode
 text easier (conversion with bytes, outputting xml, and calculating how many
 columns a string takes).
 
 This is the python3 version of the kitchen module.
 
-%package -n python3-kitchen-doc
+%package -n python%{python3_pkgversion}-kitchen-doc
 Summary:    API documentation for the Kitchen python3 module
 #Requires: %{name} = %{version}-%{release}
-%description -n python3-kitchen-doc
+%description -n python%{python3_pkgversion}-kitchen-doc
 kitchen includes functions to make gettext easier to use, handling unicode
 text easier (conversion with bytes, outputting xml, and calculating how many
 columns a string takes).
@@ -121,12 +127,11 @@ popd
 
 # Build docs
 %if 0%{?fedora} || 0%{?rhel} >= 6
-
 sphinx-build kitchen2/docs/ build/sphinx/html
 cp -pr build/sphinx/html .
 rm -rf html/.buildinfo
 
-%if 0%{?with_python3}
+%if 0%{?with_python3} && 0%{?fedora}
 pushd %{py3dir}
 sphinx-build-3 kitchen3/docs/ build/sphinx/html
 cp -pr build/sphinx/html .
@@ -173,19 +178,22 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if 0%{?with_python3}
-%files -n python3-kitchen
+%files -n python%{python3_pkgversion}-kitchen
 %defattr(-,root,root,-)
 %doc README.rst NEWS.rst COPYING COPYING.LESSER
 %{python3_sitelib}/*
 
-%files -n python3-kitchen-doc
+%files -n python%{python3_pkgversion}-kitchen-doc
 %doc COPYING COPYING.LESSER kitchen3/docs/*
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?fedora}
 %doc html
 %endif
 %endif
 
 %changelog
+* Mon Jun 29 2015 Ralph Bean <rbean@redhat.com> - 1.2.1-3
+- Support python34 on EPEL7.
+
 * Tue Dec 02 2014 Ralph Bean <rbean@redhat.com> - 1.2.1-2
 - Include patch to get py34 tests working for rawhide.