- new URLs, updated to 0.4.7

diff --git a/libp11.spec b/libp11.spec
index 01c7926d40dd5f456cde7348ecb7c456772484f4..77f5795d8fccda6d90d6220b4e9c6c5c0c1c4a8d 100644 (file)
--- a/libp11.spec
+++ b/libp11.spec
@@ -1,18 +1,18 @@
-# TODO
-# - package apidocs
 Summary:       Layer on top of PKCS#11 API to make using PKCS#11 implementations easier
 Summary(pl.UTF-8):     Warstwa powyżej API PKCS#11 ułatwiająca używanie implementacji PKCS#11
 Name:          libp11
-Version:       0.2.8
-Release:       2
+Version:       0.4.7
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
-Source0:       http://www.opensc-project.org/files/libp11/%{name}-%{version}.tar.gz
-# Source0-md5: f46dcbbea13a0732ab095d36283d5060
-URL:           http://www.opensc-project.org/libp11/
+#Source0Download: https://github.com/OpenSC/libp11/releases
+Source0:       https://github.com/OpenSC/libp11/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 0902e692c7a5d2b96505913240b33220
+URL:           https://github.com/OpenSC/libp11
 BuildRequires: doxygen
-BuildRequires: libltdl-devel
-BuildRequires: openssl-devel >= 0.9.7
+BuildRequires: openssl-devel >= 0.9.8
+# for proxy_module detection
+BuildRequires: p11-kit-devel
 BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,8 +31,7 @@ Summary:      Header files for libp11 library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libp11
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libltdl-devel
-Requires:      openssl-devel >= 0.9.7
+Requires:      openssl-devel >= 0.9.8
 
 %description devel
 Header files for libp11 library.
@@ -52,12 +51,47 @@ Static libp11 library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libp11.
 
+%package apidocs
+Summary:       API documentation for libp11 library
+Summary(pl.UTF-8):     Dokumentacja API biblioteki libp11
+Group:         Documentation
+
+%description apidocs
+API documentation for libp11 library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libp11.
+
+%package -n openssl-engine-pkcs11
+Summary:       PKCS#11 engine for OpenSSL
+Summary(pl.UTF-8):     Silnik PKCS#11 dla OpenSSL-a
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      openssl >= 0.9.8
+
+%description -n openssl-engine-pkcs11
+engine_pkcs11 is an implementation of an engine for OpenSSL. It can be
+loaded using code, config file or command line and will pass any
+function call by openssl to a PKCS#11 module. Engine_pkcs11 is meant
+to be used with smart cards and software for using smart cards in
+PKCS#11 format, such as OpenSC.
+
+%description -n openssl-engine-pkcs11 -l pl.UTF-8
+engine_pkcs11 to implementacja silnika dla OpenSSL-a. Może być
+wczytany przy użyciu kodu, pliku konfiguracyjnego i linii poleceń;
+przekazuje wszystkie wywołania funkcji openssl-a do modułu PKCS#11.
+engine_pkcs11 jest przeznaczony do używania z kartami procesorowymi i
+oprogramowaniem do używania kart procesorowych w formacie PKCS#11,
+takim jak OpenSC.
+
 %prep
 %setup -q
 
 %build
 %configure \
-       --enable-api-doc
+       --enable-api-doc \
+       --disable-silent-rules \
+       --with-enginesdir=/%{_lib}/engines
 %{__make}
 
 %install
@@ -71,6 +105,10 @@ cp -af examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # obsoleted by pkgconfig
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libp11.la
+# loadable module
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/engines/*.la
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libp11
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,18 +118,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS doc/{README,nonpersistent/{ChangeLog,wiki.out/*}}
+%doc NEWS README.md
 %attr(755,root,root) %{_libdir}/libp11.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libp11.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/api.out/html/*
 %attr(755,root,root) %{_libdir}/libp11.so
 %{_includedir}/libp11.h
+%{_includedir}/p11_err.h
 %{_pkgconfigdir}/libp11.pc
 %{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libp11.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/api.out/html/*
+
+%files -n openssl-engine-pkcs11
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/engines/libpkcs11.so
+%attr(755,root,root) /%{_lib}/engines/pkcs11.so