Author: dmacvicar Date: Wed Nov 28 21:55:00 2007 New Revision: 42481 URL: http://svn.opensuse.org/viewcvs/yast?rev=42481&view=rev Log: Some additional variables to make the spec file work Modified: trunk/devtools/devtools/cmake/modules/FindYast.cmake trunk/devtools/devtools/cmake/modules/YastCommon.cmake Modified: trunk/devtools/devtools/cmake/modules/FindYast.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/cmake/modules/FindYast.cmake?rev=42481&r1=42480&r2=42481&view=diff ============================================================================== --- trunk/devtools/devtools/cmake/modules/FindYast.cmake (original) +++ trunk/devtools/devtools/cmake/modules/FindYast.cmake Wed Nov 28 21:55:00 2007 @@ -1,3 +1,14 @@ +# +# Find YaST and sets the following variables +# YAST_INCLUDE_DIR +# YAST_LIBRARY +# YAST_PLUGIN_DIR +# YAST_DATA_DIR +# YAST_PLUGIN_SCR_LIBRARY +# YAST_PLUGIN_WFM_LIBRARY +# YAST_YCP_LIBRARY +# + # set /usr as default prefix if not set IF ( DEFINED CMAKE_INSTALL_PREFIX ) MESSAGE(STATUS "prefix set to ${CMAKE_INSTALL_PREFIX}") @@ -33,6 +44,8 @@ ) SET(YAST_PLUGIN_DIR ${LIB_INSTALL_DIR}/YaST2/plugin) +SET(YAST_IMAGE_DIR ${CMAKE_INSTALL_PREFIX}/YaST2/plugin) +SET(YAST_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/data) FIND_LIBRARY(YAST_LIBRARY NAMES y2 PATHS @@ -72,7 +85,7 @@ MESSAGE( STATUS "YaST2 not found") endif(YAST_INCLUDE_DIR AND YAST_LIBRARY AND YAST_YCP_LIBRARY) -MARK_AS_ADVANCED(YAST_INCLUDE_DIR YAST_LIBRARY YAST_YCP_LIBRARY YAST_PLUGIN_WFM_LIBRARY YAST_PLUGIN_SCR_LIBRARY ${YAST_PLUGIN_DIR}) +MARK_AS_ADVANCED(YAST_INCLUDE_DIR YAST_LIBRARY YAST_YCP_LIBRARY YAST_PLUGIN_WFM_LIBRARY YAST_PLUGIN_SCR_LIBRARY YAST_PLUGIN_DIR YAST_IMAGE_DIR YAST_DATA_DIR) Modified: trunk/devtools/devtools/cmake/modules/YastCommon.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/cmake/modules/YastCommon.cmake?rev=42481&r1=42480&r2=42481&view=diff ============================================================================== --- trunk/devtools/devtools/cmake/modules/YastCommon.cmake (original) +++ trunk/devtools/devtools/cmake/modules/YastCommon.cmake Wed Nov 28 21:55:00 2007 @@ -5,11 +5,11 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) #SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH}) -IF (NOT DEFINED PACKAGE) - FILE(READ "${CMAKE_SOURCE_DIR}/RPMNAME" PACKAGE) -ENDIF (NOT DEFINED PACKAGE) +IF (NOT DEFINED RPMNAME) + FILE(READ "${CMAKE_SOURCE_DIR}/RPMNAME" RPMNAME) +ENDIF (NOT DEFINED RPMNAME) -MESSAGE(STATUS "package name set to '${PACKAGE}'") +MESSAGE(STATUS "package name set to '${RPMNAME}'") INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake) SET ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) @@ -17,7 +17,42 @@ # RPM SPEC # #################################################################### MESSAGE(STATUS "Writing spec file...") -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PACKAGE}.spec.in ${CMAKE_BINARY_DIR}/package/${PACKAGE}.spec @ONLY) + +SET(HEADER-COMMENT +"# +# spec file for package ${RPMNAME} (Version ${VERSION}) +# +# norootforbuild", +#"/work/built/info/failed/ +) + +SET(HEADER +"Name: ${RPMNAME} +Version: ${VERSION} +Release: 0 +License: GPL +Group: System/YaST +BuildRoot: %{_tmppath}/%{name}-%{version}-build\n +Source0: ${RPMNAME}-${VERSION}.tar.bz2" +) + +SET(PREP +"%prep +%setup -n ${RPMNAME}-${VERSION}" +) + +SET(CLEAN +"%clean +rm -rf \"\$RPM_BUILD_ROOT\"" +) + + +SET(INSTALL +"%install +make install DESTDIR=\"$RPM_BUILD_ROOT\"" +) + +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${RPMNAME}.spec.in ${CMAKE_BINARY_DIR}/package/${RPMNAME}.spec @ONLY) #################################################################### SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "-") @@ -28,7 +63,7 @@ SET( CPACK_GENERATOR "TBZ2") SET( CPACK_SOURCE_GENERATOR "TBZ2") -SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" ) +SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${RPMNAME}-${VERSION}" ) # The following components are regex's to match anywhere (unless anchored) # in absolute path + filename to find files or directories to be excluded @@ -52,7 +87,7 @@ COMMAND ${CMAKE_MAKE_PROGRAM} package_source COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes" + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${RPMNAME}.changes" "${CMAKE_BINARY_DIR}/package/${RPMNAME}.changes" ) ADD_CUSTOM_TARGET( srcpackage_local -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org