diff --git a/keyutils-1.5.3.tar.bz2 b/keyutils-1.5.3.tar.bz2 deleted file mode 100644 index 728f704..0000000 --- a/keyutils-1.5.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f99866cf0f65c97042c273dd9d8703ce230387619f56ef3ef87b481833ca5e55 -size 48763 diff --git a/keyutils-1.5.5.tar.bz2 b/keyutils-1.5.5.tar.bz2 new file mode 100644 index 0000000..f01cca0 --- /dev/null +++ b/keyutils-1.5.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fab781fb2d1450b2112a7fbfe6629522ae5a6b901f875a74a201012025a3fc5 +size 63397 diff --git a/keyutils.changes b/keyutils.changes index a4eb388..421b90c 100644 --- a/keyutils.changes +++ b/keyutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 20 07:40:08 UTC 2012 - meissner@suse.com + +- various small improvements +- added a /etc/request-key.d/ snippet drop directory + ------------------------------------------------------------------- Mon Jun 4 18:00:41 UTC 2012 - jeffm@suse.com diff --git a/keyutils.spec b/keyutils.spec index 903078a..765d18d 100644 --- a/keyutils.spec +++ b/keyutils.spec @@ -22,12 +22,11 @@ Url: http://people.redhat.com/~dhowells/keyutils/ Summary: Linux Key Management Utilities License: GPL-2.0+ ; LGPL-2.1+ Group: System/Kernel -Version: 1.5.3 +Version: 1.5.5 Release: 0 Source0: http://people.redhat.com/~dhowells/keyutils/%name-%version.tar.bz2 Source1: baselibs.conf Patch1: request-key-cifs.patch -Patch2: parallel-make.patch Patch3: request-key-nfs4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,7 +57,6 @@ This package provides headers and libraries for building key utilities. %prep %setup -q %patch1 -p0 -%patch2 -p0 %patch3 -p1 %build @@ -79,6 +77,7 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l /usr/share/keyutils %{_mandir}/*/* %config(noreplace) /etc/* +%dir /etc/request-key.d/ %files -n %lname %defattr(-,root,root,-) diff --git a/parallel-make.patch b/parallel-make.patch deleted file mode 100644 index 29f5814..0000000 --- a/parallel-make.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile.orig -+++ Makefile -@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makef - %.o: %.c keyutils.h Makefile - $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< - --keyctl: keyctl.o -lkeyutils -+keyctl: keyctl.o $(DEVELLIB) - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils - --request-key: request-key.o -lkeyutils -+request-key: request-key.o $(DEVELLIB) - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils - --key.dns_resolver: key.dns_resolver.o -lkeyutils -+key.dns_resolver: key.dns_resolver.o $(DEVELLIB) - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv - - ###############################################################################