Clean spec file for yocto compliancetizen_4.0.m1_releasetizen_3.0_ivi_releasetizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasetizen_3.0.m14.3_ivi_releasetizen_3.0.2014.q3_common_releasesubmit/tizen_unified/20170308.100413submit/tizen_mobile/20141120.000000submit/tizen_ivi/20160217.000005submit/tizen_ivi/20160217.000000submit/tizen_ivi/20140916.000000submit/tizen_common/20140912.150451submit/tizen_common/20140912.150039submit/tizen_4.0/20170811.094300submit/tizen_3.0_mobile/20161015.000003submit/tizen_3.0_ivi/20161010.000003submit/tizen_3.0_common/20161104.104000submit/tizen_3.0/20161028.092423submit/tizen_3.0/20161028.062323submit/tizen_3.0.m2/20170104.093752submit/tizen/20161017.022041submit/tizen/20160818.080744accepted/tizen/wearable/20161018.091117accepted/tizen/unified/20170309.035718accepted/tizen/tv/20161018.091107accepted/tizen/mobile/20161018.091045accepted/tizen/mobile/20160819.063408accepted/tizen/ivi/20161018.091144accepted/tizen/ivi/20160819.063423accepted/tizen/ivi/20160218.024840accepted/tizen/common/20160818.144600accepted/tizen/common/20140915.091240accepted/tizen/4.0/unified/20170816.010850accepted/tizen/3.0/wearable/20161028.150802accepted/tizen/3.0/tv/20161028.143426accepted/tizen/3.0/mobile/20161028.143105accepted/tizen/3.0/mobile/20161015.033416accepted/tizen/3.0/ivi/20161028.151223accepted/tizen/3.0/ivi/20161011.044256accepted/tizen/3.0/common/20161114.110905accepted/tizen/3.0.m2/wearable/20170104.143901accepted/tizen/3.0.m2/tv/20170104.143500accepted/tizen/3.0.m2/mobile/20170104.143025tizen_3.0_tvtizen_3.0_ivitizen_3.0.m2tizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.m14.3_ivitizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commontizen_3.0accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_commonaccepted/tizen_3.0_wearableaccepted/tizen_3.0_tvaccepted/tizen_3.0_mobileaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobileaccepted/tizen_3.0.m14.3_iviaccepted/tizen_3.0.2014.q3_common

Change-Id: I59b1a89e354a1482f921ee5c2d95849797afc476
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

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}/*