LIB: Fix the library naming

Fix the library naming to be libkeyutils.so.x.y.z, not libkeyutils-x.y.z.so as
the former is the preferred way, and the latter is only used by a few
exceptional packages, such as glibc.

Signed-off-by: David Howells <dhowells@redhat.com>
diff --git a/Makefile b/Makefile
index 3ee35c6..88c3d9d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 ARLIB		:= libkeyutils.a
 DEVELLIB	:= libkeyutils.so
 SONAME		:= libkeyutils.so.$(MAJOR)
-LIBNAME		:= libkeyutils-$(VERSION).so
+LIBNAME		:= libkeyutils.so.$(VERSION)
 
 LNS		:= ln -sf
 
diff --git a/keyutils.spec b/keyutils.spec
index 7c0469e..feb4bdd 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -2,11 +2,13 @@
 %define version %{vermajor}.3
 %define libdir /%{_lib}
 %define usrlibdir %{_prefix}/%{_lib}
+%define libapivermajor 1
+%define libapiversion %{libapivermajor}.3
 
 Summary: Linux Key Management Utilities
 Name: keyutils
 Version: %{version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 ExclusiveOS: Linux
@@ -79,8 +81,8 @@
 %files libs
 %defattr(-,root,root,-)
 %doc LICENCE.LGPL
-%{libdir}/libkeyutils-%{version}.so
-%{libdir}/libkeyutils.so.%{vermajor}
+%{libdir}/libkeyutils.so.%{libapiversion}
+%{libdir}/libkeyutils.so.%{libapivermajor}
 
 %files libs-devel
 %defattr(-,root,root,-)
@@ -89,6 +91,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Mar 19 2010 David Howells  <dhowells@redhat.com> - 1.3-4
+- Fix the library naming wrt the version.
+
 * Fri Mar 19 2010 David Howells  <dhowells@redhat.com> - 1.3-3
 - Fix spelling mistakes in manpages.
 - Add an index manpage for all the keyctl functions.