diff --git a/baselibs.conf b/baselibs.conf index e544e44..4c33a00 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libp11-1 +libp11-2 diff --git a/libp11-0.2.7.tar.bz2 b/libp11-0.2.7.tar.bz2 deleted file mode 100644 index 943df79..0000000 --- a/libp11-0.2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a681812825f43f16c2446f045427d270783bd2245e57d407178cd337b2ceb14b -size 296789 diff --git a/libp11-0.2.8.tar.gz b/libp11-0.2.8.tar.gz new file mode 100644 index 0000000..d314d11 --- /dev/null +++ b/libp11-0.2.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4121015503ade98074b5e2a2517fc8a139f8b28aed10021db2bb77283f40691 +size 377508 diff --git a/libp11.changes b/libp11.changes index 67e138c..659f0d9 100644 --- a/libp11.changes +++ b/libp11.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 25 17:00:26 CEST 2012 - sbrabec@suse.cz + +- Update to version 0.2.8: + * Bumped soname for PKCS11_token struct size changes. + * Display the number of available slots. + * Expose more token flags in PKCS11_token structure. + * Check that private data is not NULL in pkcs11_release_slot. + ------------------------------------------------------------------- Sun Nov 20 06:13:41 UTC 2011 - coolo@suse.com diff --git a/libp11.spec b/libp11.spec index b2665bc..4819c5f 100644 --- a/libp11.spec +++ b/libp11.spec @@ -1,7 +1,7 @@ # # spec file for package libp11 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libp11 -Version: 0.2.7 -Release: 1 +Version: 0.2.8 +Release: 0 Url: http://www.opensc-project.org/libp11/ -Group: Productivity/Security -License: LGPL-2.1+ Summary: Library Implementing a Small Layer on Top of PKCS#11 API -Source: %{name}-%{version}.tar.bz2 +License: LGPL-2.1+ +Group: Productivity/Security +Source: %{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc Source2: baselibs.conf -BuildRequires: doxygen libtool openssl-devel pkg-config zlib-devel +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,12 +45,11 @@ Libp11 source code includes the official header files (version 2.20) and thus is "derived from the RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki)". -%package -n libp11-1 -License: LGPL-2.1+ -Group: Productivity/Security +%package -n libp11-2 Summary: Library Implementing a Small Layer on Top of PKCS#11 API +Group: Productivity/Security -%description -n libp11-1 +%description -n libp11-2 Libp11 is a library implementing a small layer on top of PKCS#11 API to make using PKCS#11 implementations easier. @@ -59,10 +61,10 @@ and thus is "derived from the RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki)". %package devel -License: LGPL-2.1+ -Group: Development/Libraries/C and C++ Summary: Library Implementing a Small Layer on Top of PKCS#11 API -Requires: libp11-1 = %{version} openssl-devel +Group: Development/Libraries/C and C++ +Requires: libp11-2 = %{version} +Requires: openssl-devel %description devel Libp11 is a library implementing a small layer on top of PKCS#11 API to @@ -87,26 +89,27 @@ autoreconf -f -i %endif %configure --disable-static --with-pic \ --enable-doc\ - --docdir=%{_docdir}/libp11-1\ + --docdir=%{_docdir}/libp11-2\ --enable-api-doc\ --with-apidocdir=%{_docdir}/%{name}-devel make %{?jobs:-j%jobs} %install %makeinstall -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/libp11-1 +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_docdir}/libp11-2 rm -f %{buildroot}%{_libdir}/*.la +%fdupes %{buildroot}%{_docdir} %clean rm -rf $RPM_BUILD_ROOT -%post -n libp11-1 -p /sbin/ldconfig +%post -n libp11-2 -p /sbin/ldconfig -%postun -n libp11-1 -p /sbin/ldconfig +%postun -n libp11-2 -p /sbin/ldconfig -%files -n libp11-1 +%files -n libp11-2 %defattr (-, root, root) -%doc %{_docdir}/libp11-1 +%doc %{_docdir}/libp11-2 %{_libdir}/*.so.* %files devel