Author: dmacvicar Date: Wed Aug 8 16:23:47 2007 New Revision: 6528 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6528&view=rev Log: - clean packages/ dir for old files - autobuild and autobuild_local to srcpackage and srcpackage_local - rename lintrc file - run migrate-sources in %post (#292986) Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/libzypp.spec.cmake trunk/libzypp/tools/migrate-sources/CMakeLists.txt Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=6528&r1=6527&r2=6528&view=diff ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Wed Aug 8 16:23:47 2007 @@ -165,11 +165,15 @@ #################################################################### # RPM SPEC # #################################################################### -MESSAGE(STATUS "Writing spec file...") -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libzypp.spec.cmake ${CMAKE_BINARY_DIR}/package/libzypp.spec @ONLY) -MESSAGE(STATUS "I hate you rpm-lint...!!!") -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/libzypp-rpmlint.cmake ${CMAKE_BINARY_DIR}/package/libzypp-${VERSION}-rpmlintrc @ONLY) +MACRO(SPECFILE) + MESSAGE(STATUS "Writing spec file...") + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libzypp.spec.cmake ${CMAKE_BINARY_DIR}/package/libzypp.spec @ONLY) + MESSAGE(STATUS "I hate you rpm-lint...!!!") + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/libzypp-rpmlint.cmake ${CMAKE_BINARY_DIR}/package/libzypp-rpmlintrc @ONLY) +ENDMACRO(SPECFILE) + +SPECFILE() MESSAGE(STATUS "Writing pkg-config file...") CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libzypp.pc.cmake ${CMAKE_BINARY_DIR}/libzypp.pc @ONLY) @@ -211,17 +215,18 @@ ) SET( AUTOBUILD_COMMAND + COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/package/*.tar.bz2 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" ) -ADD_CUSTOM_TARGET( autobuild_local +ADD_CUSTOM_TARGET( srcpackage_local ${AUTOBUILD_COMMAND} ) -ADD_CUSTOM_TARGET( autobuild +ADD_CUSTOM_TARGET( srcpackage COMMAND ${CMAKE_MAKE_PROGRAM} svncheck ${AUTOBUILD_COMMAND} ) Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=6528&r1=6527&r2=6528&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Wed Aug 8 16:23:47 2007 @@ -19,7 +19,7 @@ Version: @VERSION@ Release: 0 Source: @PACKAGE@-@VERSION@.tar.bz2 -Source1: @PACKAGE@-@VERSION@-rpmlintrc +Source1: @PACKAGE@-rpmlintrc Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -99,6 +99,7 @@ %post %run_ldconfig +%{prefix}/lib/zypp/zypp-migrate-sources %postun %run_ldconfig Modified: trunk/libzypp/tools/migrate-sources/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/migrate-sources/CMakeLists.txt?rev=6528&r1=6527&r2=6528&view=diff ============================================================================== --- trunk/libzypp/tools/migrate-sources/CMakeLists.txt (original) +++ trunk/libzypp/tools/migrate-sources/CMakeLists.txt Wed Aug 8 16:23:47 2007 @@ -2,6 +2,8 @@ migrate-sources.cc ) -ADD_EXECUTABLE( migrate-sources ${migrate_SRCS} ) -TARGET_LINK_LIBRARIES( migrate-sources zypp ) -TARGET_LINK_LIBRARIES( migrate-sources xml2 ) \ No newline at end of file +ADD_EXECUTABLE( zypp-migrate-sources ${migrate_SRCS} ) +TARGET_LINK_LIBRARIES( zypp-migrate-sources zypp ) +TARGET_LINK_LIBRARIES( zypp-migrate-sources xml2 ) + +INSTALL(TARGETS zypp-migrate-sources RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/zypp ) \ No newline at end of file -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org