Problem: CFFI RPM builds with both python 2 and 3 broken

Solution: do common steps only once

Author: bluca

zproject_redhat.gsl

@@ -279,7 +279,7 @@ sh autogen.sh
 
 make %{_smp_mflags}
 .if python_cffi ?= 1
-%if %{with python_cffi}
+%if %{with python_cffi} || %{with python3_cffi}
 # Problem: we need pkg-config points to built and not yet installed copy of $(project.name)
 # Solution: chicken-egg problem - let's make "fake" pkg-config file
 sed -e "s@^libdir.*@libdir=.libs/@" \\
@@ -290,20 +290,11 @@ cd bindings/python_cffi
 ln -sfr ../../include/ .
 ln -sfr ../../src/.libs/ .
 export PKG_CONFIG_PATH=`pwd`
+%endif
+%if %{with python_cffi}
 python2 setup.py build
 %endif
-
 %if %{with python3_cffi}
-# Problem: we need pkg-config points to built and not yet installed copy of $(project.name)
-# Solution: chicken-egg problem - let's make "fake" pkg-config file
-sed -e "s@^libdir.*@libdir=.libs/@" \\
-    -e "s@^includedir.*@includedir=include/@" \\
-    src/$(project.libname).pc > bindings/python_cffi/$(project.libname).pc
-cd bindings/python_cffi
-# This avoids problem with "weird" character quoting between shell and python3
-ln -sfr ../../include/ .
-ln -sfr ../../src/.libs/ .
-export PKG_CONFIG_PATH=`pwd`
 python3 setup.py build
 %endif
 .endif
@@ -316,17 +307,17 @@ find %{buildroot} -name '*.a' | xargs rm -f
 find %{buildroot} -name '*.la' | xargs rm -f
 
 .if python_cffi ?= 1
-%if %{with python_cffi}
+%if %{with python_cffi} || %{with python3_cffi}
 cd bindings/python_cffi
 export PKG_CONFIG_PATH=`pwd`
+%endif
+%if %{with python_cffi}
 python2 setup.py install --root=%{buildroot} --skip-build --prefix %{_prefix}
 %endif
-
 %if %{with python3_cffi}
-cd bindings/python_cffi
-export PKG_CONFIG_PATH=`pwd`
 python3 setup.py install --root=%{buildroot} --skip-build --prefix %{_prefix}
 %endif
+
 .endif
 .if has_main | project.has_bin
 %files