Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/keyutils.git#4ae07952596d3574ade818bc6b0c1786b48eeb9a

keyutils.spec

@@ -1,14 +1,11 @@
-%define vermajor 1
-%define verminor 6
-%define version %{vermajor}.%{verminor}
 %define libapivermajor 1
-%define libapiversion %{libapivermajor}.8
+%define libapiversion %{libapivermajor}.9
 
 # % define buildid .local
 
 Name:    keyutils
-Version: %{version}
+Version: 1.6.1
-Release: 5%{?buildid}%{?dist}
+Release: 1%{?buildid}%{?dist}
 Summary: Linux Key Management Utilities
 License: GPLv2+ and LGPLv2+
 Url:     http://people.redhat.com/~dhowells/keyutils/
@@ -17,6 +14,7 @@ Source0: http://people.redhat.com/~dhowells/keyutils/keyutils-%{version}.tar.bz2
 
 BuildRequires: gcc
 BuildRequires: glibc-kernheaders >= 2.4-9.1.92
+BuildRequires: make
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
@@ -41,8 +39,6 @@ This package provides headers and libraries for building key utilities.
 %prep
 %setup -q
 
-%define datadir %{_datarootdir}/keyutils
-
 %build
 make \
 	NO_ARLIB=1 \
@@ -53,7 +49,7 @@ make \
 	SBINDIR=%{_sbindir} \
 	MANDIR=%{_mandir} \
 	INCLUDEDIR=%{_includedir} \
-	SHAREDIR=%{datadir} \
+	SHAREDIR=%{_datadir}/%{name} \
 	RELEASE=.%{release} \
 	NO_GLIBC_KEYERR=1 \
 	CFLAGS="-Wall $RPM_OPT_FLAGS" \
@@ -70,7 +66,7 @@ make \
 	SBINDIR=%{_sbindir} \
 	MANDIR=%{_mandir} \
 	INCLUDEDIR=%{_includedir} \
-	SHAREDIR=%{datadir} \
+	SHAREDIR=%{_datadir}/%{name} \
 	install
 
 %ldconfig_scriptlets libs
@@ -78,27 +74,32 @@ make \
 %files
 %doc README
 %license LICENCE.GPL
-%{_sbindir}/*
+%config(noreplace) %{_sysconfdir}/*
-%{_bindir}/*
+%{_bindir}/keyctl
-%{datadir}
+%{_sbindir}/key.dns_resolver
+%{_sbindir}/request-key
+%{_datadir}/%{name}
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-%config(noreplace) %{_sysconfdir}/*
 
 %files libs
 %license LICENCE.LGPL
-%{_mandir}/man7/*
 %{_libdir}/libkeyutils.so.%{libapiversion}
 %{_libdir}/libkeyutils.so.%{libapivermajor}
+%{_mandir}/man7/*
 
 %files libs-devel
 %{_libdir}/libkeyutils.so
-%{_includedir}/*
+%{_includedir}/keyutils.h
-%{_mandir}/man3/*
 %{_libdir}/pkgconfig/libkeyutils.pc
+%{_mandir}/man3/*
 
 %changelog
+* Tue Jan  5 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.6.1-1
+- Update to 1.6.1
+- Spec cleanups
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (keyutils-1.6.tar.bz2) = ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff
+SHA512 (keyutils-1.6.1.tar.bz2) = ea6e20b2594234c7f51581eef2b8fd19c109fa9eacaaef8dfbb4f237bd1d6fdf071ec23b4ff334cb22a46461d09d17cf499987fd1f00e66f27506888876961e1