clean up from merge

This commit is contained in:
Jeffrey C. Ollie 2013-09-05 11:10:30 -05:00
parent 23a742e22b
commit 91923289d7

View File

@ -126,11 +126,9 @@ find %{py3dir}/examples -type f | xargs chmod a-x
%endif %endif
%if 0%{?with_python26} %if 0%{?with_python26}
pushd %{py2dir}
rm -rf %{py26dir} rm -rf %{py26dir}
cp -a . %{py26dir} cp -a %{py2dir} %{py26dir}
find %{py26dir} -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python26}|' find %{py26dir} -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python26}|'
popd
%endif %endif
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
@ -139,18 +137,6 @@ pushd %{py2dir}
popd popd
%endif %endif
%if 0%{?with_python26}
rm -rf %{py26dir}
cp -a . %{py26dir}
find %{py26dir} -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python26}|'
%endif
%if 0%{?rhel} == 5
%patch0 -p1
%endif
%patch1 -p1 -b .tlsa
%build %build
pushd %{py2dir} pushd %{py2dir}
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
@ -172,19 +158,6 @@ pushd %{py3dir}
popd popd
%endif %endif
%if 0%{?with_python26}
pushd %{py26dir}
CFLAGS="%{optflags}" %{__python26} setup.py build
popd
%endif
%if 0%{?with_python3}
pushd %{py3dir}
CFLAGS="%{optflags}" %{__python3} setup.py build
popd
%endif
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
@ -208,20 +181,6 @@ pushd %{py3dir}
popd popd
%endif %endif
%if 0%{?with_python26}
pushd %{py26dir}
CFLAGS="%{optflags}" %{__python26} setup.py install --skip-build --root %{buildroot}
popd
%endif
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} -c 'import setuptools; exec(open("setup.py").read())' install \
--skip-build --root %{buildroot}
popd
%endif
%check %check
pushd %{py2dir}/tests pushd %{py2dir}/tests
# skip one test because it queries the network # skip one test because it queries the network
@ -266,31 +225,6 @@ done
popd popd
%endif %endif
%if 0%{?with_python26}
pushd %{py26dir}/tests
# skip one test because it queries the network
for py in *.py
do
if [ $py != resolver.py ]
then
PYTHONPATH=%{buildroot}%{python26_sitelib} %{__python26} $py
fi
done
%endif
%if 0%{?with_python3}
pushd %{py3dir}/tests
for py in *.py
do
if [ $py != resolver.py ]
then
PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} $py
fi
done
popd
%endif
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}