Fix for versioning information.

diff --git a/ChangeLog b/ChangeLog
index 032d08384a6412a69aebc3c62a04993c9424ea15..e1761803bd4cb6b5f783d308507deb60d64a9ecc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.42 Tue Jul  6 12:29:50 PDT 2010
+  * Mistake in libtool caused issue with library version
+
 0.41 Wed Jun 30 13:15:19 PDT 2010
   * Added --file for memcat.
   * Added limemcached_ping() to libmemcached_util

diff --git a/configure.ac b/configure.ac
index 0db997591b1b3ce2731459b6edabb36b6f03ae46..d450ef1f26529113ab44ca5e4a942170c720a816 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,14 +7,16 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.41],[http://libmemcached.org/])
+AC_INIT([libmemcached],[0.42],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 
 PANDORA_CANONICAL_TARGET
 
 #shared library versioning
-MEMCACHED_LIBRARY_VERSION=5:1:1
+MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0
+MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
+MEMCACHED_LIBRARY_VERSION=5:1:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -25,6 +27,8 @@ MEMCACHED_LIBRARY_VERSION=5:1:1
 #                  |        +- increment if source code has changed
 #                  |           set to zero if current is incremented
 #                  +- increment if interfaces have been added, removed or changed
+AC_SUBST(MEMCACHED_UTIL_LIBRARY_VERSION)
+AC_SUBST(MEMCACHED_PROTOCAL_LIBRARY_VERSION)
 AC_SUBST(MEMCACHED_LIBRARY_VERSION)
 
 

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 123b1af3f4660c7720d3b7690c4cb64b766aa14d..280d2c7e20e4f8dc8dbe0bac868c22fe9c518b95 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -65,7 +65,7 @@ libmemcached_libmemcachedprotocol_la_SOURCES =  \
                                                libmemcached/protocol/pedantic.c \
                                                libmemcached/protocol/protocol_handler.c
 
-libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}
 
 noinst_LTLIBRARIES+= \
                     libmemcached/libmemcachedcallbacks.la
@@ -133,7 +133,7 @@ libmemcached_libmemcachedutil_la_SOURCES= \
                                          libmemcached/util/pool.c \
                                          libmemcached/util/version.c
 libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
 libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
 
 if BUILD_BYTEORDER

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index daab44eb05770c0271ddcc9b3f1bf8ea84026b68..b181f63b20c6820d07f85c893663cece9bdb8d95 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -82,10 +82,14 @@ you will need to install %{name}-devel.
 %exclude %{_libdir}/libhashkit.la
 %exclude %{_libdir}/libmemcachedutil.la
 %exclude %{_libdir}/libmemcachedprotocol.la
-%{_libdir}/libhashkit.so.*
-%{_libdir}/libmemcached.so.*
-%{_libdir}/libmemcachedutil.so.*
-%{_libdir}/libmemcachedprotocol.so.*
+%{_libdir}/libhashkit.so.0.0.0
+%{_libdir}/libmemcached.so.5.0.1
+%{_libdir}/libmemcachedutil.so.1.0.0
+%{_libdir}/libmemcachedprotocol.so.0.0.0
+%{_libdir}/libhashkit.so.0
+%{_libdir}/libmemcached.so.5
+%{_libdir}/libmemcachedprotocol.so.0
+%{_libdir}/libmemcachedutil.so.1
 %{_mandir}/man1/memcapable.1.gz
 %{_mandir}/man1/memcat.1.gz
 %{_mandir}/man1/memcp.1.gz