From 56e2b1ea6ea14260c75726cd26a55dd9eb471c89ca92f5b137a5e18c6d31f065 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 22 Sep 2011 15:57:03 +0000
Subject: [PATCH] Accepting request 84476 from home:jengelh:bl-new

Implement shlib package (libkeyutils1), cleanup per guidelines

OBS-URL: https://build.opensuse.org/request/show/84476
OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=10
---
 baselibs.conf    |  6 +++++-
 keyutils.changes |  6 ++++++
 keyutils.spec    | 40 +++++++++++-----------------------------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index 484bff8..597a1f1 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,5 @@
-keyutils-libs
+# Change from "<=" to "<" on 1.5
+libkeyutils1
+	obsoletes "keyutils-libs <= <version>"
+	provides "keyutils-libs = <version>"
+
diff --git a/keyutils.changes b/keyutils.changes
index 305e2cf..35b0498 100644
--- a/keyutils.changes
+++ b/keyutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 22 12:41:50 UTC 2011 - jengelh@medozas.de
+
+- Implement shlib package (libkeyutils1)
+- Cleanup per Specfile Guidelines
+
 -------------------------------------------------------------------
 Tue Apr 19 13:45:30 CEST 2011 - meissner@suse.de
 
diff --git a/keyutils.spec b/keyutils.spec
index b96b176..796760b 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -15,11 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           keyutils
-Url:            http://people.redhat.com/~dhowells/keyutils/
+%define lname	libkeyutils1
+URL:            http://people.redhat.com/~dhowells/keyutils/
 License:        GPLv2+ ; LGPLv2.1+
 Group:          System/Kernel
 AutoReqProv:    on
@@ -37,56 +37,38 @@ Utilities to control the kernel key management facility and to provide
 a mechanism by which the kernel can call back to user space to get a
 key instantiated.
 
-
-
-Authors:
---------
-    David Howells <dhowells@redhat.com>
-
-%package libs
-License:        GPLv2+ ; LGPLv2.1+
+%package -n %lname
 Summary:        Key utilities library
 Group:          System/Kernel
+Obsoletes:      keyutils-libs < %version-%release
+Provides:       keyutils-libs = %version-%release
 
-%description libs
+%description -n %lname
 This package provides a wrapper library for the key management facility
 system calls.
 
-
-
-Authors:
---------
-    David Howells <dhowells@redhat.com>
-
 %package devel
-License:        GPLv2+ ; LGPLv2.1+
 Summary:        Development package for building linux key management utilities
 Group:          System/Kernel
-Requires:       %{name}-libs = %{version} glibc-devel 
+Requires:       %lname = %version, glibc-devel 
 
 %description devel
 This package provides headers and libraries for building key utilities.
 
-
-
-Authors:
---------
-    David Howells <dhowells@redhat.com>
-
 %prep
 %setup -q
 %patch1
 %patch2 -p1
 
 %build
-make %{?jobs:-j%jobs} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_lib
 
-%post libs -p /sbin/ldconfig 
+%post -n %lname -p /sbin/ldconfig 
 
-%postun libs -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -97,7 +79,7 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
 %{_mandir}/*/*
 %config(noreplace) /etc/*
 
-%files libs
+%files -n %lname
 %defattr(-,root,root,-)
 %doc LICENCE.LGPL
 /%{_lib}/libkeyutils.so.*