diff --git a/python-dns.spec b/python-dns.spec index 0a522b2..c336138 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -126,11 +126,9 @@ find %{py3dir}/examples -type f | xargs chmod a-x %endif %if 0%{?with_python26} -pushd %{py2dir} rm -rf %{py26dir} -cp -a . %{py26dir} +cp -a %{py2dir} %{py26dir} find %{py26dir} -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python26}|' -popd %endif %if 0%{?rhel} == 5 @@ -139,18 +137,6 @@ pushd %{py2dir} popd %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 pushd %{py2dir} %if 0%{?rhel} == 5 @@ -172,19 +158,6 @@ pushd %{py3dir} popd %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 rm -rf %{buildroot} @@ -208,20 +181,6 @@ pushd %{py3dir} popd %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 pushd %{py2dir}/tests # skip one test because it queries the network @@ -230,13 +189,13 @@ pushd %{py2dir}/tests for py in *.py do %if 0%{?rhel} == 5 - if [ $py != resolver.py -a $py != dnssec.py -a $py != grange.py ] + if [ $py != resolver.py -a $py != dnssec.py -a $py != grange.py ] %else - if [ $py != resolver.py ] + if [ $py != resolver.py ] %endif - then - PYTHONPATH=%{buildroot}%{python_sitelib} %{__python} $py - fi + then + PYTHONPATH=%{buildroot}%{python_sitelib} %{__python} $py + fi done popd @@ -244,52 +203,27 @@ popd 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 -popd -%endif - -%if 0%{?with_python3} -pushd %{py3dir}/tests -# skip one test because it queries the network -for py in *.py -do - if [ $py != resolver.py ] - then - PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} $py - fi -done -popd -%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 + PYTHONPATH=%{buildroot}%{python26_sitelib} %{__python26} $py fi done popd %endif +%if 0%{?with_python3} +pushd %{py3dir}/tests +# skip one test because it queries the network +for py in *.py +do + if [ $py != resolver.py ] + then + PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} $py + fi +done +popd +%endif %clean rm -rf %{buildroot}