[ipython] Move pushd/popd to do_global_symlink macro

Thomas Spura tomspur at fedoraproject.org
Mon Jun 23 13:31:02 UTC 2014


commit 7f0453527df54f86070620ca6816270f7141fdea
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Mon Jun 23 09:21:53 2014 +0200

    Move pushd/popd to do_global_symlink macro

 ipython.spec |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/ipython.spec b/ipython.spec
index 22878e4..e73edc2 100644
--- a/ipython.spec
+++ b/ipython.spec
@@ -410,6 +410,7 @@ rm simplegeneric/_simplegeneric.py
 popd
 
 %define do_global_symlinking() \
+pushd IPython/html/static/components \
     pushd font-awesome \
         rm -rf font \
         ln -s %{_datadir}/fonts/fontawesome font \
@@ -439,13 +440,12 @@ popd
         ln -s %{_jsdir}/$folder/ $folder/lib \
     done \
 ls -l \
-ls -l *
+ls -l * \
+popd
 
 # unbundle components
-pushd IPython/html/static/components
 %do_global_symlinking
 #asdf
-popd
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -489,16 +489,12 @@ popd
 
 # unbundle components again...
 pushd %{buildroot}%{python_sitelib}
-    pushd IPython/html/static/components
-        %do_global_symlinking
-    popd
+    %do_global_symlinking
 popd
 
 %if 0%{?with_python3}
 pushd %{buildroot}%{python3_sitelib}
-    pushd IPython/html/static/components
-        %do_global_symlinking
-    popd
+    %do_global_symlinking
 popd
 %endif # with_python3
 


More information about the scm-commits mailing list