Merge topic 'CPackHandleParenthesisInSystemName'
4a4a53f
CPackRPM Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
This commit is contained in:
commit
f7c58fe5f3
|
@ -548,16 +548,16 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
|
||||||
# We do only save CPack installed tree in _prepr
|
# We do only save CPack installed tree in _prepr
|
||||||
# and then restore it in build.
|
# and then restore it in build.
|
||||||
%prep
|
%prep
|
||||||
mv $RPM_BUILD_ROOT \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot
|
mv $RPM_BUILD_ROOT \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\"
|
||||||
|
|
||||||
#p build
|
#p build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
if [ -e $RPM_BUILD_ROOT ];
|
if [ -e $RPM_BUILD_ROOT ];
|
||||||
then
|
then
|
||||||
mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot/* $RPM_BUILD_ROOT
|
mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot/*\" $RPM_BUILD_ROOT
|
||||||
else
|
else
|
||||||
mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT
|
mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" $RPM_BUILD_ROOT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
|
|
Loading…
Reference in New Issue