X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopensc.git;a=blobdiff_plain;f=opensc.spec;h=1f1a85dafdc3a0bf7e9f40029b9fdfca7c59100a;hp=a71b0062e330f23110235e505cdc5e62957fe358;hb=24aae78192a2eced78fba8c63bf77f2dba29693e;hpb=8aaccbaa85c30273b22e4093c2631c131176b6a7

diff --git a/opensc.spec b/opensc.spec
index a71b006..1f1a85d 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,28 +1,26 @@
 Summary:	OpenSC library - for accessing SmartCard devices using PC/SC Lite
 Summary(pl):	Biblioteka OpenSC - do korzystania z kart procesorowych przy u¿yciu PC/SC Lite
 Name:		opensc
-Version:	0.9.4
+Version:	0.10.1
 Release:	1
 Epoch:		0
 License:	LGPL
 Group:		Applications
-Source0:	http://www.opensc.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	76c18fc9bd9fad9c45396ea81f317551
-Patch0:		%{name}-libdir.patch
-Patch1:		%{name}-shared-ssl.patch
-Patch2:		%{name}-segv.patch
-Patch3:		%{name}-explorer-debug.patch
+Source0:	http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
+# Source0-md5:	5549c7c339775356784837887750d232
+Patch0:		%{name}-explorer-debug.patch
+Patch1:		%{name}-libassuan.patch
 URL:		http://www.opensc.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	libassuan-devel >= 1:0.6.0
+BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	openct-devel
-BuildRequires:	pam-devel
 BuildRequires:	pcsc-lite-devel
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,6 +53,7 @@ Summary:	OpenSC development files
 Summary(pl):	Pliki dla programistów u¿ywaj±cych OpenSC
 Group:		Development/Tools
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	libltdl-devel
 Requires:	openct-devel
 Requires:	openssl-devel
 Requires:	pcsc-lite-devel
@@ -77,20 +76,6 @@ Static OpenSC libraries.
 %description static -l pl
 Statyczne biblioteki OpenSC.
 
-%package -n pam-pam_opensc
-Summary:	OpenSC module for PAM
-Summary(pl):	Modu³ PAM OpenSC
-License:	GPL
-Group:		Base
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	pam_opensc
-
-%description -n pam-pam_opensc
-OpenSC module for PAM.
-
-%description -n pam-pam_opensc -l pl
-Modu³ PAM OpenSC.
-
 %package -n mozilla-plugin-opensc
 Summary:	OpenSC Signer plugin for Mozilla
 Summary(pl):	Wtyczka OpenSC Signer dla Mozilli
@@ -108,12 +93,10 @@ Wtyczka OpenSC Signer dla Mozilli.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I aclocal
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -130,22 +113,16 @@ install -d $RPM_BUILD_ROOT%{mozplugindir}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/%{_lib}
-
 # just install instead of symlinking
 rm -f $RPM_BUILD_ROOT%{mozplugindir}/opensc-signer.so
 mv -f $RPM_BUILD_ROOT%{_libdir}/opensc/opensc-signer.so $RPM_BUILD_ROOT%{mozplugindir}
 
 # default config
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf{.example,}
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/scldap.conf{.example,}
+install etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 # useless (dlopened by *.so)
-rm -f $RPM_BUILD_ROOT%{_libdir}/{libscam,opensc-*}.{a,la} \
-	$RPM_BUILD_ROOT%{_libdir}/opensc/*.{a,la} \
-	$RPM_BUILD_ROOT%{_libdir}/pkcs11/*.{a,la} \
-	$RPM_BUILD_ROOT/%{_lib}/security/pam_opensc.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/{opensc,pkcs11}-*.{a,la} \
+	$RPM_BUILD_ROOT%{_libdir}/opensc/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -155,26 +132,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE ChangeLog NEWS docs/{pkcs-15v1_1.asn,opensc.{html,css}}
+%doc NEWS README doc/{*.{html,css},html/tools.html}
 %attr(755,root,root) %{_bindir}/cardos-info
 %attr(755,root,root) %{_bindir}/cryptoflex-tool
+%attr(755,root,root) %{_bindir}/eidenv
+%attr(755,root,root) %{_bindir}/netkey-tool
 %attr(755,root,root) %{_bindir}/opensc-explorer
 %attr(755,root,root) %{_bindir}/opensc-tool
 %attr(755,root,root) %{_bindir}/pkcs11-tool
 %attr(755,root,root) %{_bindir}/pkcs15-*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %{_libdir}/libscam.so
 %attr(755,root,root) %{_libdir}/opensc-pkcs11.so
-%dir %{_libdir}/pkcs11
-%attr(755,root,root) %{_libdir}/pkcs11/pkcs11-spy.so
-%dir %{_libdir}/opensc
-%attr(755,root,root) %{_libdir}/opensc/engine_opensc.so
-%attr(755,root,root) %{_libdir}/opensc/engine_pkcs11.so
+%attr(755,root,root) %{_libdir}/pkcs11-spy.so
 %dir %{_datadir}/opensc
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf
-%config(noreplace) %verify(not size mtime md5) %{_datadir}/opensc/*.profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_datadir}/opensc/*.profile
 %{_mandir}/man1/cardos-info.1*
 %{_mandir}/man1/cryptoflex-tool.1*
+%{_mandir}/man1/netkey-tool.1*
 %{_mandir}/man1/opensc-explorer.1*
 %{_mandir}/man1/opensc-tool.1*
 %{_mandir}/man1/pkcs11-tool.1*
@@ -183,13 +158,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/html/api.html
 %attr(755,root,root) %{_bindir}/opensc-config
 %attr(755,root,root) %{_libdir}/libopensc.so
-%attr(755,root,root) %{_libdir}/libpkcs11.so
 %attr(755,root,root) %{_libdir}/libpkcs15init.so
 %attr(755,root,root) %{_libdir}/libscconf.so
-%attr(755,root,root) %{_libdir}/libscldap.so
-%{_libdir}/lib*.la
+%{_libdir}/libopensc.la
+%{_libdir}/libpkcs15init.la
+%{_libdir}/libscconf.la
 %{_includedir}/opensc
 %{_pkgconfigdir}/*.pc
 %{_mandir}/man1/opensc-config.1*
@@ -197,11 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
-
-%files -n pam-pam_opensc
-%defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/security/pam_opensc.so
+%{_libdir}/libopensc.a
+%{_libdir}/libpkcs15init.a
+%{_libdir}/libscconf.a
 
 %files -n mozilla-plugin-opensc
 %defattr(644,root,root,755)