From fbc5ea2207be7c8f3200de6c14ee8729c723c2fb Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 7 Jun 2017 14:49:12 +0200 Subject: fix local rpm build Signed-off-by: Ronan Le Martret --- conf.d/templates/cmake/common.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'conf.d/templates/cmake') diff --git a/conf.d/templates/cmake/common.cmake b/conf.d/templates/cmake/common.cmake index 25a665d..b46e809 100644 --- a/conf.d/templates/cmake/common.cmake +++ b/conf.d/templates/cmake/common.cmake @@ -207,11 +207,12 @@ macro(rpm_package_build) endforeach() # build rpm spec file from template - configure_file(${RPM_TEMPLATE_DIR}/rpm-config.spec.in ${SPEC_DIR}/rpm-${PROJECT_NAME}.spec) + configure_file(${RPM_TEMPLATE_DIR}/rpm-config.spec.in ${SPEC_DIR}/${PROJECT_NAME}.spec) add_custom_command(OUTPUT ${PROJECT_NAME}.rpm DEPENDS ${PROJECT_TARGETS} - COMMAND rpmbuild -ba ${SPEC_DIR}/rpm-${PROJECT_NAME}.spec + COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git archive --format=tar.gz --prefix=${PROJECT_NAME}-${PROJECT_VERSION}/ HEAD -o ${SPEC_DIR}/${PROJECT_NAME}_${PROJECT_VERSION}.orig.tar.gz + COMMAND rpmbuild --define=\"%_sourcedir ${SPEC_DIR}\" -ba ${SPEC_DIR}/${PROJECT_NAME}.spec ) add_custom_target(rpm DEPENDS ${PROJECT_NAME}.rpm) @@ -379,4 +380,4 @@ macro(project_closing_msg) endmacro() # Add RSYSTARGET -remote_targets_populate() \ No newline at end of file +remote_targets_populate() -- cgit 1.2.3-korg