summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2018-09-05 06:25:59 -0400
committerB Stack <bgstack15@gmail.com>2018-09-05 06:25:59 -0400
commitca081174207870451d5baa24bba99b67c73ae597 (patch)
tree0fe9156dbbcbca2af378878abd64a0c00e0f897d
parentfix typo for scl (diff)
downloadstackrpms-ca081174207870451d5baa24bba99b67c73ae597.tar.gz
stackrpms-ca081174207870451d5baa24bba99b67c73ae597.tar.bz2
stackrpms-ca081174207870451d5baa24bba99b67c73ae597.zip
rearrange popd
-rw-r--r--palemoon/palemoon.spec23
1 files changed, 10 insertions, 13 deletions
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index 8c34bb0..40de2a4 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -62,20 +62,17 @@ and themes to make the browser truly your own.
%{__cp} %{SOURCE1} ./.mozconfig
%build
+thispwd=$( pwd )
+%if 0%{?el7}
+scl enable detoolset-7 /bin/bash << EOF
+pushd $thispwd
+%endif
+%if !%{dummy_package}
+./mach build
+%endif
%if 0%{?el7}
- #source /usr/bin/gcc49
- %if !%{dummy_package}
- thispwd=$( pwd )
- scl enable devtoolset-7 /bin/bash << EOF
- pushd $thispwd
- ./mach build
- popd
+popd || :
EOF
- %endif
-%else
- %if !%{dummy_package}
- ./mach build
- %endif
%endif
%install
@@ -99,8 +96,8 @@ make -f client.mk \
install
%endif
%if 0%{?el7}
+popd || :
EOF
-popd
%endif
# cleanup
bgstack15