[mingw-p11-kit] New upstream release.

mooninite mooninite at fedoraproject.org
Sun Sep 22 21:05:35 UTC 2013


commit 2bc89ca631e3e152bfb59d0702df44fcc657e96f
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Sun Sep 22 16:05:18 2013 -0500

    New upstream release.

 .gitignore                     |    1 +
 mingw-p11-kit.spec             |   10 ++++++----
 p11-kit-mingw-test.patch       |   11 -----------
 p11-kit-mingw-trust-test.patch |   18 ++++++++++++++++++
 sources                        |    2 +-
 5 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a1a98e..0d9cb9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /p11-kit-0.18.2.tar.gz
 /p11-kit-0.18.4.tar.gz
 /p11-kit-0.19.3.tar.gz
+/p11-kit-0.20.1.tar.gz
diff --git a/mingw-p11-kit.spec b/mingw-p11-kit.spec
index a530c37..aa73868 100644
--- a/mingw-p11-kit.spec
+++ b/mingw-p11-kit.spec
@@ -1,7 +1,7 @@
 %?mingw_package_header
 
 Name:           mingw-p11-kit
-Version:        0.19.3
+Version:        0.20.1
 Release:        1%{?dist}
 Summary:        MinGW Library for loading and sharing PKCS#11 modules
 
@@ -9,8 +9,7 @@ License:        BSD
 Group:          Development/Libraries
 URL:            http://p11-glue.freedesktop.org/p11-kit.html
 Source0:        http://p11-glue.freedesktop.org/releases/p11-kit-%{version}.tar.gz
-# add define around unix-only test
-Patch100:       p11-kit-mingw-test.patch
+Patch100:       p11-kit-mingw-trust-test.patch
 
 BuildArch:      noarch
 
@@ -73,7 +72,7 @@ way that they're discoverable.  This library is cross-compiled for MinGW.
 
 %prep
 %setup -q -n p11-kit-%{version}
-%patch100 -p1 -b .mingw-test
+%patch100 -p1 -b .trust-test
 
 
 %build
@@ -122,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
 
 %changelog
+* Sun Sep 22 2013 Michael Cronenworth <mike at cchtml.com> - 0.20.1-1
+- New upstream release.
+
 * Mon Jul 29 2013 Michael Cronenworth <mike at cchtml.com> - 0.19.3-1
 - New upstream release.
 
diff --git a/p11-kit-mingw-trust-test.patch b/p11-kit-mingw-trust-test.patch
new file mode 100644
index 0000000..a1696d9
--- /dev/null
+++ b/p11-kit-mingw-trust-test.patch
@@ -0,0 +1,18 @@
+--- p11-kit-0.20.1/trust/tests/test-token.c.orig	2013-08-29 08:41:42.000000000 -0500
++++ p11-kit-0.20.1/trust/tests/test-token.c	2013-09-22 16:00:51.830799454 -0500
+@@ -238,11 +238,15 @@
+ {
+ 	p11_token *token;
+ 
++#ifdef OS_UNIX
+ 	if (getuid () != 0) {
++#endif
+ 		token = p11_token_new (333, "/", "Label");
+ 		assert (!p11_token_is_writable (token));
+ 		p11_token_free (token);
++#ifdef OS_UNIX
+ 	}
++#endif
+ 
+ 	token = p11_token_new (333, "", "Label");
+ 	assert (!p11_token_is_writable (token));
diff --git a/sources b/sources
index 218f1f8..cda9b72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93991e05314e71d873ebd8963a14d015  p11-kit-0.19.3.tar.gz
+88c651137f76a167336639371eafd8cc  p11-kit-0.20.1.tar.gz


More information about the scm-commits mailing list