[p11-kit/f19] Update to new upstream stable release 0.18.0

[Stef Walter]

commit c67ee7ed100948e1a94ac8b3b62c129c857e13cc
Author: Stef Walter <stefw at gnome.org>
Date:   Thu Apr 4 09:07:18 2013 +0200

    Update to new upstream stable release 0.18.0
    
    Also:
    - Various logging tweaks (#928914, #928750)
    - Make the 'p11-kit extract-trust' explicitly reject
      additional arguments

 p11-kit-extract-trust |    5 +++++
 p11-kit.spec          |   14 +++++++++-----
 sources               |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/p11-kit-extract-trust b/p11-kit-extract-trust
index 2529473..fe9c991 100755
--- a/p11-kit-extract-trust
+++ b/p11-kit-extract-trust
@@ -7,5 +7,10 @@ if test "$UID" != "0"; then
 	exit 2
 fi
 
+if test $# -gt 1; then
+	echo "p11-kit: no additional arguments are supported for this command" >&2
+	exit 2
+fi
+
 exec /usr/bin/update-ca-trust
 
diff --git a/p11-kit.spec b/p11-kit.spec
index aa4d360..a0b602a 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,13 +1,12 @@
 Name:           p11-kit
-Version:        0.17.5
-Release:        2%{?dist}
+Version:        0.18.0
+Release:        1%{?dist}
 Summary:        Library for loading and sharing PKCS#11 modules
 
 License:        BSD
 URL:            http://p11-glue.freedesktop.org/p11-kit.html
 Source0:        http://p11-glue.freedesktop.org/releases/p11-kit-%{version}.tar.gz
 Source1:	p11-kit-extract-trust
-Patch0:		0001-Use-CKA_X_CERTIFICATE_VALUE-for-trust-assertions.patch
 BuildRequires:  libtasn1-devel >= 2.14
 
 %description
@@ -48,7 +47,6 @@ contains certificate anchors and black lists.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # These paths are the source paths that  come from the plan here:
@@ -110,7 +108,13 @@ fi
 
 
 %changelog
-* Fri Mar 29 2013 Stef Walter <stefw at redhat.com> - 0.17.5.2
+* Thu Apr 04 2013 Stef Walter <stefw at redhat.com> - 0.18.0-1
+- Update to new upstream stable release
+- Various logging tweaks (#928914, #928750)
+- Make the 'p11-kit extract-trust' explicitly reject
+  additional arguments
+
+* Fri Mar 29 2013 Stef Walter <stefw at redhat.com> - 0.17.5-2
 - Fix problem with empathy connecting to Google Talk (#928913)
 
 * Thu Mar 28 2013 Stef Walter <stefw at redhat.com> - 0.17.5-1
diff --git a/sources b/sources
index 84a8d73..90dcad8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a32570fb37070435e66cd62028aa47d  p11-kit-0.17.5.tar.gz
+abb4683c7f193df6e48dbfad443ec9a8  p11-kit-0.18.0.tar.gz