Changeset 1015

Timestamp:

Feb 22, 2017, 2:06:31 PM (8 years ago)

Author:

dmik

Message:

rpm: Remove redundantsh -c in %scm_setup.

Building RPMs requires [EMX]SHELL to be set to sh anyway so specifying
it for the second time is redundant and will just cause an unnecessary
fork.

File:

• rpm/trunk/macros.in (modified) (3 diffs)

rpm/trunk/macros.in

@@ -1327 +1327 @@
 
 %__scm_setup_svn\
-%if %{?__source_rev:%(sh -c 'if test -f "%SOURCE0" ; then echo 1 ; else echo 0 ; fi')}%{!?__source_rev:0}\
+%if %{?__source_rev:%(if test -f "%SOURCE0" ; then echo 1 ; else echo 0 ; fi)}%{!?__source_rev:0}\
 %setup -q\
 %else\
@@ -1347 +1347 @@
 
 %__scm_setup_git\
-%if %{?__source_rev:%(sh -c 'if test -f "%SOURCE0" ; then echo 1 ; else echo 0 ; fi')}%{!?__source_rev:0}\
+%if %{?__source_rev:%(if test -f "%SOURCE0" ; then echo 1 ; else echo 0 ; fi)}%{!?__source_rev:0}\
 %setup -q\
 %else\
@@ -1371 +1371 @@
 %__scm_setup_github\
 %{!?__source_rev:%{error:%0: Revision in %%scm_source is required for GitHub}exit 1}\
-%global __source_url_github_name %(sh -c 'URL="%{__source_url}" ; echo ${URL##*/}')\
+%global __source_url_github_name %(URL="%{__source_url}" ; echo ${URL##*/})\
 %global __source_dir_github %{__source_url_github_name}-%{__source_rev}\
-%if %{?__source_rev:%(sh -c 'if test -f "%SOURCE0" ; then echo 1 ; else echo 0 ; fi')}%{!?__source_rev:0}\
+%if %{?__source_rev:%(if test -f "%SOURCE0" ; then echo 1 ; else echo 0 ; fi)}%{!?__source_rev:0}\
 %setup -n "%__source_dir_github" -q\
 %else\