- clean packages/ dir for old files

- autobuild and autobuild_local to srcpackage and srcpackage_local
- rename lintrc file
- run migrate-sources in %post (#292986)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34c9cc2..3fb4432 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,11 +165,15 @@ MESSAGE(STATUS "version: ${VERSION}")
 ####################################################################
 # 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 @@ ADD_CUSTOM_TARGET( svncheck
 )
 
 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}
 )

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 194e3dd..4226da8 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -19,7 +19,7 @@ Summary:        Package, Patch, Pattern, and Product Management
 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 @@ cd ..
 
 %post
 %run_ldconfig
+%{prefix}/lib/zypp/zypp-migrate-sources
 
 %postun
 %run_ldconfig

diff --git a/tools/migrate-sources/CMakeLists.txt b/tools/migrate-sources/CMakeLists.txt
index 82c78e4..d89ebeb 100644 (file)
--- a/tools/migrate-sources/CMakeLists.txt
+++ b/tools/migrate-sources/CMakeLists.txt
@@ -2,6 +2,8 @@ SET( migrate_SRCS
 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