[packages/keyutils/DEVEL] - updated to 1.6 - removed disable-krb5 patch, Kerberos dependency has been removed by upstream - ad

[qboosh]

commit c37b1e7e92721307e555b78e1e431ba81f352bd3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 8 17:42:58 2019 +0200

    - updated to 1.6
    - removed disable-krb5 patch, Kerberos dependency has been removed by upstream
    - added pkgconfigdir patch (fix pkgconfig file location with split /lib)

 keyutils-disable-krb5.patch | 19 -------------------
 keyutils-pkgconfigdir.patch | 20 ++++++++++++++++++++
 keyutils.spec               | 14 +++++---------
 3 files changed, 25 insertions(+), 28 deletions(-)
---
diff --git a/keyutils.spec b/keyutils.spec
index 6836cb6..043f246 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -5,23 +5,21 @@
 %else
 %bcond_without	glibc24		# build for older glibc
 %endif
-%bcond_without	krb5		# key.dns_resolver (requires MIT Kerberos)
 
 Summary:	Linux Key Management Utilities
 Summary(pl.UTF-8):	Narzędzia do linuksowego zarządzania kluczami
 Name:		keyutils
-Version:	1.5.11
+Version:	1.6
 Release:	1
 License:	LGPL v2+ (library), GPL v2+ (utility)
 Group:		Base
 Source0:	http://people.redhat.com/~dhowells/keyutils/%{name}-%{version}.tar.bz2
-# Source0-md5:	bcc0984181572461850a37c39f8b167a
+# Source0-md5:	191987b0ab46bb5b50efd70a6e6ce808
 Patch0:		helpers.patch
-Patch1:		%{name}-disable-krb5.patch
+Patch1:		%{name}-pkgconfigdir.patch
 URL:		https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git
 BuildRequires:	rpmbuild(macros) >= 1.402
 %{?with_glibc24:BuildRequires:	glibc-devel >= 6:2.4}
-%{?with_krb5:BuildRequires:	krb5-devel}
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -80,9 +78,7 @@ Statyczna biblioteka do zarządzania linuksowymi kluczami.
 %prep
 %setup -q
 %patch0 -p1
-%if %{without krb5}
 %patch1 -p1
-%endif
 
 %build
 %{__make} -j1 \
@@ -113,9 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) /bin/keyctl
-%if %{with krb5}
 %attr(755,root,root) /sbin/key.dns_resolver
-%endif
 %attr(755,root,root) /sbin/request-key
 %dir %{_datadir}/keyutils
 %attr(755,root,root) %{_datadir}/keyutils/*.sh
@@ -134,11 +128,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkeyutils.so
 %{_includedir}/keyutils.h
+%{_pkgconfigdir}/libkeyutils.pc
 %{_mandir}/man3/keyctl.3*
 %{_mandir}/man3/keyctl_*.3*
 %{_mandir}/man3/find_key_by_type_and_name.3*
 %{_mandir}/man3/recursive_key_scan.3*
 %{_mandir}/man3/recursive_session_key_scan.3*
+%{_mandir}/man7/asymmetric-key.7*
 %{_mandir}/man7/keyutils.7*
 
 %files static
diff --git a/keyutils-disable-krb5.patch b/keyutils-disable-krb5.patch
deleted file mode 100644
index d905fc4..0000000
--- a/keyutils-disable-krb5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- keyutils-1.5.11/Makefile.orig	2018-05-11 16:30:30.000000000 +0200
-+++ keyutils-1.5.11/Makefile	2018-09-01 20:26:06.474216636 +0200
-@@ -95,7 +95,7 @@
- # Normal build rule
- #
- ###############################################################################
--all: keyctl request-key key.dns_resolver
-+all: keyctl request-key
- 
- ###############################################################################
- #
-@@ -176,7 +176,6 @@
- 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
- 	$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
--	$(INSTALL) -D key.dns_resolver $(DESTDIR)$(SBINDIR)/key.dns_resolver
- 	$(INSTALL) -D -m 0644 request-key.conf $(DESTDIR)$(ETCDIR)/request-key.conf
- 	mkdir -p $(DESTDIR)$(ETCDIR)/request-key.d
- 	mkdir -p $(DESTDIR)$(MAN1)
diff --git a/keyutils-pkgconfigdir.patch b/keyutils-pkgconfigdir.patch
new file mode 100644
index 0000000..ca139c6
--- /dev/null
+++ b/keyutils-pkgconfigdir.patch
@@ -0,0 +1,20 @@
+--- keyutils-1.6/Makefile.orig	2018-11-13 17:28:30.000000000 +0100
++++ keyutils-1.6/Makefile	2019-06-08 17:26:50.685712296 +0200
+@@ -80,7 +80,7 @@
+ endif
+ 
+ PKGCONFIG 	:= libkeyutils.pc
+-PKGCONFIG_DIR 	:= pkgconfig
++PKGCONFIG_DIR 	:= $(USRLIBDIR)/pkgconfig
+ 
+ ###############################################################################
+ #
+@@ -192,7 +192,7 @@
+ 	-e 's, at libdir\@,$(USRLIBDIR),g' \
+ 	-e 's, at includedir\@,$(INCLUDEDIR),g' \
+ 	< $(PKGCONFIG).in > $(PKGCONFIG) || rm $(PKGCONFIG)
+-	$(INSTALL) -D $(PKGCONFIG) $(DESTDIR)$(LIBDIR)/$(PKGCONFIG_DIR)/$(PKGCONFIG)
++	$(INSTALL) -D $(PKGCONFIG) $(DESTDIR)$(PKGCONFIG_DIR)/$(PKGCONFIG)
+ 	rm $(PKGCONFIG)
+ endif
+ 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/keyutils.git/commitdiff/c37b1e7e92721307e555b78e1e431ba81f352bd3