[python-social-auth: 6/6] Merge branch 'el6'

[Jakub QB Dorňák]

commit 6484472157a02aaf9b1a9a1c928c541d577314a8
Merge: 0bdf35f 715fbb6
Author: Jakub Dorňák <jdornak at redhat.com>
Date:   Fri Mar 28 11:58:29 2014 +0100

    Merge branch 'el6'

 python-social-auth.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc python-social-auth.spec
index 12770ac,7aba8e0..04bbbb1
--- a/python-social-auth.spec
+++ b/python-social-auth.spec
@@@ -1,14 -1,17 +1,21 @@@
- %if 0%{?el7}
 -%if 0%{?el6}
++%if 0%{?el6}%{?el7}
      # python3 and python version related macros
      # required to build python3- subpackage
-     # are not available in epel7
 -    # are not available in el6
++    # are not available in el6 and epel7
      %global with_python3    0
      %global __python2       %{__python}
      %global python2_sitelib %{python_sitelib}
 +%else
 +    %bcond_without python3
 +%endif
- %bcond_without doc
++
++%if 0%{?el6}
+     # sphinx.ext.viewcode required to build -doc subpackage
+     # is not available in el6
 -    %global with_doc        0
++    %global with_doc    0
+ %else
 -    %bcond_without python3
+     %bcond_without doc
+ %endif
  
  %global pkgname social-auth