I think this fixes the soname stuff

3 files changed, 11 insertions, 21 deletions

diff --git a/botan_version.py b/botan_version.py
index ff1b7c22b..0a87a1a89 100644
--- a/botan_version.py
+++ b/botan_version.py
@@ -1,8 +1,6 @@
 
-major = 1
-minor = 9
-patch = 16
+release_major = 1
+release_minor = 9
+release_patch = 16
 
-so_patch = 16
-release_suffix = '-dev'
-datestamp = 0
+release_datestamp = 20110411
diff --git a/configure.py b/configure.py
index c0d92406b..508eb9971 100755
--- a/configure.py
+++ b/configure.py
@@ -47,18 +47,13 @@ class BuildConfigurationInformation(object):
     """
     Version information
     """
-    version_major = botan_version.major
-    version_minor = botan_version.minor
-    version_patch = botan_version.patch
-    version_so_patch = botan_version.so_patch
-    version_suffix = botan_version.release_suffix
+    version_major = botan_version.release_major
+    version_minor = botan_version.release_minor
+    version_patch = botan_version.release_patch
 
-    version_datestamp = botan_version.datestamp
+    version_datestamp = botan_version.release_datestamp
 
-    version_string = '%d.%d.%d%s' % (
-        version_major, version_minor, version_patch, version_suffix)
-    soversion_string = '%d.%d.%d' % (
-        version_major, version_minor, version_so_patch)
+    version_string = '%d.%d.%d' % (version_major, version_minor, version_patch)
 
     """
     Constructor
@@ -963,8 +958,6 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
 
         'version_datestamp': build_config.version_datestamp,
 
-        'so_version': build_config.soversion_string,
-
         'timestamp': build_config.timestamp(),
         'user':      build_config.username(),
         'hostname':  build_config.hostname(),
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index 8691a08de..db89f6c88 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -11,7 +11,6 @@ LINK_TO       = %{link_to}
 
 # Version Numbers
 VERSION       = %{version}
-SO_VERSION    = %{so_version}
 
 # Installation Settings
 DESTDIR       = %{prefix}
@@ -57,8 +56,8 @@ LIBRARIES     = $(STATIC_LIB) $(SHARED_LIB)
 LIBNAME       = %{lib_prefix}libbotan
 STATIC_LIB    = $(LIBNAME).a
 
-SHARED_LIB    = $(LIBNAME).%{so_suffix}.$(VERSION)
-SONAME        = $(LIBNAME).%{so_suffix}.$(SO_VERSION)
+SONAME        = $(LIBNAME)-%{version_major}.%{version_minor}.%{so_suffix}
+SHARED_LIB    = $(SONAME).%{version_patch}
 
 SYMLINK       = libbotan.%{so_suffix}