|
|
@ -102,16 +102,14 @@ popd
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
%install
|
|
|
|
|
|
|
|
%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with python3}
|
|
|
|
%if %{with python3}
|
|
|
|
# Must do the python3 install first because the scripts in /usr/bin are
|
|
|
|
|
|
|
|
# overwritten with every setup.py install and they only work with python2.
|
|
|
|
|
|
|
|
pushd %{py3dir}
|
|
|
|
pushd %{py3dir}
|
|
|
|
%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
|
|
|
|
%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
|
|
|
|
popd
|
|
|
|
popd
|
|
|
|
%endif # with python3
|
|
|
|
%endif # with python3
|
|
|
|
|
|
|
|
|
|
|
|
%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
%check
|
|
|
|
%if %{with unittests}
|
|
|
|
%if %{with unittests}
|
|
|
@ -163,6 +161,7 @@ popd
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
* Fri Nov 7 2014 Garrett Holmstrom <gholms@fedoraproject.org> - 2.34.0-1
|
|
|
|
* Fri Nov 7 2014 Garrett Holmstrom <gholms@fedoraproject.org> - 2.34.0-1
|
|
|
|
- Updated to 2.34.0 (RH #1072925, RH #1072928, RH #1161229)
|
|
|
|
- Updated to 2.34.0 (RH #1072925, RH #1072928, RH #1161229)
|
|
|
|
|
|
|
|
- Made executables point to python2 (RH #1152444)
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Aug 21 2014 Garrett Holmstrom <gholms@fedoraproject.org> - 2.32.1-1
|
|
|
|
* Thu Aug 21 2014 Garrett Holmstrom <gholms@fedoraproject.org> - 2.32.1-1
|
|
|
|
- Updated to 2.32.1 (RH #1126056, RH #1132348)
|
|
|
|
- Updated to 2.32.1 (RH #1126056, RH #1132348)
|
|
|
|