kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPackRPM: tolerate redhat specific clean BUILD ROOT pre-build macro (bug 9872)

Browse Source 
Eric
This commit is contained in:
Eric Noulard 2009-11-15 13:55:42 -05:00
parent 04d3f576b1
commit 147aa6bf80
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/CPackRPM.cmake
View File

@ -415,15 +415,15 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
%description %description
\@CPACK_RPM_PACKAGE_DESCRIPTION\@ \@CPACK_RPM_PACKAGE_DESCRIPTION\@
# This is a shortcutted spec file # This is a shortcutted spec file generated by CMake RPM generator
# generated by CMake RPM generator # we skip _install step because CPack does that for us.
# we skip the _prepn _build and _install # We do only save CPack installed tree in _prepr
# steps because CPack does that for us # and then restore it in build.
# WE MUST NOT DO ANYTHING in those steps because they %prep
# may fail for non-privileged user mv $RPM_BUILD_ROOT \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot
#p prep
#p build %build
mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT
#p install #p install
@ -443,11 +443,15 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
#p dir %{prefix}
#p {prefix}/*
${CPACK_RPM_INSTALL_FILES} ${CPACK_RPM_INSTALL_FILES}
%changelog %changelog
* Sat Nov 14 2009 Erk <eric.noulard@gmail.com>
Replace prep and build step with backup and restore
of the previously CPack installed tree. This should
mimic what is expected in rpmbuild usual steps
* Wed Nov 11 2009 Erk <eric.noulard@gmail.com>
Add support for USER defined pre/post[un]install scripts
* Wed Oct 07 2009 Erk <eric.noulard@gmail.com> * Wed Oct 07 2009 Erk <eric.noulard@gmail.com>
Add user custom spec file support Add user custom spec file support
* Sat Oct 03 2009 Kami <cmoidavid@gmail.com> * Sat Oct 03 2009 Kami <cmoidavid@gmail.com>