From: Anas Nashif <anas.nashif@intel.com>
Date: Wed, 26 Jun 2013 15:48:41 +0000 (-0400)
Subject: Update to 0.18.4
X-Git-Tag: accepted/tizen/common/20141126.162437~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=948cd47a793830388906a6d1a9394bd100beb386;p=platform%2Fupstream%2Fp11-kit.git

Update to 0.18.4
---

diff --git a/packaging/p11-kit.changes b/packaging/p11-kit.changes
index 58bc5ab..29516b2 100644
--- a/packaging/p11-kit.changes
+++ b/packaging/p11-kit.changes
@@ -1,3 +1,6 @@
+* Wed Jun 26 2013 Anas Nashif <anas.nashif@intel.com> upstream/0.18.4@0195bb1
+- Update to 0.18.4
+
 * Fri Mar 22 2013 Anas Nashif <anas.nashif@intel.com> upstream/0.12@615a0e5
 - Fixed package groups
 
diff --git a/packaging/p11-kit.spec b/packaging/p11-kit.spec
index b88ca3e..4eb3a34 100644
--- a/packaging/p11-kit.spec
+++ b/packaging/p11-kit.spec
@@ -1,5 +1,5 @@
 Name:           p11-kit
-Version:        0.12
+Version:        0.18.4
 Release:        0
 License:        BSD-3-Clause
 Summary:        Library to work with PKCS#11 modules
@@ -8,6 +8,7 @@ Group:          Security/Crypto Libraries
 Source0:        http://p11-glue.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
 BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(libtasn1)
 
 %description
 p11-kit provides a way to load and enumerate PKCS#11 modules, as well
@@ -16,7 +17,6 @@ such a way that they're discoverable.
 
 %package -n libp11-kit
 Summary:        Library to work with PKCS#11 modules
-Group:          Security/Crypto Libraries
 
 %description -n libp11-kit
 p11-kit provides a way to load and enumerate PKCS#11 modules, as well
@@ -25,7 +25,6 @@ such a way that they're discoverable.
 
 %package tools
 Summary:        Library to work with PKCS#11 modules -- Tools
-Group:          Security/Crypto Libraries
 
 %description tools
 p11-kit provides a way to load and enumerate PKCS#11 modules, as well
@@ -34,7 +33,6 @@ such a way that they're discoverable.
 
 %package devel
 Summary:        Library to work with PKCS#11 modules -- Development Files
-Group:          Development/Libraries
 Requires:       libp11-kit = %{version}
 
 %description devel
@@ -46,7 +44,7 @@ such a way that they're discoverable.
 %setup -q
 
 %build
-%configure
+%configure --without-trust-paths
 make %{?_smp_mflags}
 
 %install
@@ -58,7 +56,6 @@ install -d %{buildroot}%{_sysconfdir}/pkcs11/modules
 # with future versions of the library on file level. As replacement, we package
 # the file as documentation file.
 rm %{buildroot}%{_sysconfdir}/pkcs11/pkcs11.conf.example
-find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 
 %post -n libp11-kit -p /sbin/ldconfig
 
@@ -74,6 +71,13 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %dir %{_sysconfdir}/pkcs11/modules/
 %{_libdir}/libp11-kit.so.*
 %{_libdir}/p11-kit-proxy.so
+%dir %{_libdir}/pkcs11
+%dir %{_libdir}/p11-kit
+%{_libdir}/pkcs11/p11-kit-trust.so
+%{_libdir}/p11-kit/p11-kit-extract-trust
+%dir %_datadir/p11-kit
+%dir %_datadir/p11-kit/modules
+%_datadir/p11-kit/modules/p11-kit-trust.module
 
 %files tools
 %defattr(-,root,root)