Fixed so versioning from libtool to cmake conventions.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ee839b..4aca39a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,13 +23,16 @@ SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 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 @@ ELSE ( NOT DOXYGEN )
   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}")
 
 ####################################################################

diff --git a/VERSION.cmake b/VERSION.cmake
index 5102640..0cceabc 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -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")

diff --git a/package/libzypp.changes b/package/libzypp.changes
index a84a9e9..bed464b 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -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