summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/keyutils.spec24
1 files changed, 15 insertions, 9 deletions
diff --git a/packaging/keyutils.spec b/packaging/keyutils.spec
index 97bab23..4438ace 100644
--- a/packaging/keyutils.spec
+++ b/packaging/keyutils.spec
@@ -1,12 +1,12 @@
Name: keyutils
Url: http://people.redhat.com/~dhowells/keyutils/
Summary: Linux Key Management Utilities
-License: GPL-2.0+ ; LGPL-2.1+
+License: GPL-2.0+ and LGPL-2.1+
Group: System/Kernel
Version: 1.5.3
Release: 0
Source0: http://people.redhat.com/~dhowells/keyutils/%name-%version.tar.bz2
-Source1001: keyutils.manifest
+Source1001: keyutils.manifest
%description
Utilities to control the kernel key management facility and to provide
@@ -35,10 +35,16 @@ This package provides headers and libraries for building key utilities.
cp %{SOURCE1001} .
%build
-make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="%__cc"
+%__make %{?_smp_mflags} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="%__cc"
%install
-make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_lib
+%__make install \
+ NO_ARLIB=1 \
+ DESTDIR=%{buildroot} \
+ LIBDIR=%{_libdir} \
+ USRLIBDIR=%{_libdir} \
+ BINDIR=%{_bindir} \
+ SBINDIR=%{_sbindir}
%post -n libkeyutils -p /sbin/ldconfig
@@ -48,9 +54,9 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
%manifest %{name}.manifest
%defattr(-,root,root,-)
%license LICENCE.GPL
-/sbin/*
-/bin/*
-/usr/share/keyutils
+%{_sbindir}/*
+%{_bindir}/*
+%{_datadir}/keyutils
%{_mandir}/*/*
%config(noreplace) /etc/*
@@ -58,10 +64,10 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
%manifest %{name}.manifest
%defattr(-,root,root,-)
%license LICENCE.LGPL
-/%{_lib}/libkeyutils.so.*
+%{_libdir}/libkeyutils.so.*
%files devel
%manifest %{name}.manifest
%defattr(-,root,root,-)
-/usr/%{_lib}/libkeyutils.so
+%{_libdir}/libkeyutils.so
%{_includedir}/*