Author: mvidner Date: Mon Jun 18 17:22:21 2007 New Revision: 5771 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5771&view=rev Log: Fixed so versioning from libtool to cmake conventions. Modified: trunk/libzypp/CMakeLists.txt trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=5771&r1=5770&r2=5771&view=diff ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Mon Jun 18 17:22:21 2007 @@ -23,13 +23,16 @@ INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) MATH( EXPR LIBZYPP_CURRENT "${LIBZYPP_MAJOR} * 100 + ${LIBZYPP_MINOR}" ) MATH( EXPR LIBZYPP_AGE "${LIBZYPP_MINOR} - ${LIBZYPP_COMPATMINOR}" ) +# Libtool wanted current:patch:age +# But cmake is not libtool, it wants the verbatim suffix to libzypp.so +MATH( EXPR LIBZYPP_SO_FIRST "${LIBZYPP_CURRENT}-${LIBZYPP_AGE}" ) SET( PACKAGE "libzypp" ) SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" ) ADD_DEFINITIONS( -g ) ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" ) -SET( LIBZYPP_VERSION_INFO "${LIBZYPP_CURRENT}.${LIBZYPP_PATCH}.${LIBZYPP_AGE}" ) +SET( LIBZYPP_VERSION_INFO "${LIBZYPP_SO_FIRST}.${LIBZYPP_AGE}.${LIBZYPP_PATCH}" ) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Novell's package management core engine.") @@ -157,7 +160,7 @@ MESSAGE( STATUS "doxygen found: ${DOXYGEN}" ) ENDIF ( NOT DOXYGEN ) -MESSAGE(STATUS "soname: ${LIBZYPP_CURRENT}.${LIBZYPP_PATCH}.${LIBZYPP_AGE}") +MESSAGE(STATUS "soname: ${LIBZYPP_VERSION_INFO}") MESSAGE(STATUS "version: ${VERSION}") #################################################################### Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=5771&r1=5770&r2=5771&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Jun 18 17:22:21 2007 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "3") -SET(LIBZYPP_MINOR "2") -SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_MINOR "3") +SET(LIBZYPP_COMPATMINOR "3") +SET(LIBZYPP_PATCH "0") Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=5771&r1=5770&r2=5771&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Jun 18 17:22:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 18 17:20:45 CEST 2007 - mvidner@suse.cz + +- fixed so versioning from libtool to cmake +- 3.3.0 + +------------------------------------------------------------------- Mon Jun 18 09:47:32 CEST 2007 - dmacvicar@suse.de - Use gpg2 instead of gpg for keyring and make -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org