Move pushd/popd to do_global_symlink macro

This commit is contained in:
Thomas Spura 2014-06-23 09:21:53 +02:00
parent e7691bba23
commit 7f0453527d

View File

@ -410,6 +410,7 @@ rm simplegeneric/_simplegeneric.py
popd popd
%define do_global_symlinking() \ %define do_global_symlinking() \
pushd IPython/html/static/components \
pushd font-awesome \ pushd font-awesome \
rm -rf font \ rm -rf font \
ln -s %{_datadir}/fonts/fontawesome font \ ln -s %{_datadir}/fonts/fontawesome font \
@ -439,13 +440,12 @@ popd
ln -s %{_jsdir}/$folder/ $folder/lib \ ln -s %{_jsdir}/$folder/ $folder/lib \
done \ done \
ls -l \ ls -l \
ls -l * ls -l * \
popd
# unbundle components # unbundle components
pushd IPython/html/static/components
%do_global_symlinking %do_global_symlinking
#asdf #asdf
popd
%if 0%{?with_python3} %if 0%{?with_python3}
rm -rf %{py3dir} rm -rf %{py3dir}
@ -489,16 +489,12 @@ popd
# unbundle components again... # unbundle components again...
pushd %{buildroot}%{python_sitelib} pushd %{buildroot}%{python_sitelib}
pushd IPython/html/static/components %do_global_symlinking
%do_global_symlinking
popd
popd popd
%if 0%{?with_python3} %if 0%{?with_python3}
pushd %{buildroot}%{python3_sitelib} pushd %{buildroot}%{python3_sitelib}
pushd IPython/html/static/components %do_global_symlinking
%do_global_symlinking
popd
popd popd
%endif # with_python3 %endif # with_python3