X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopensc.git;a=blobdiff_plain;f=opensc.spec;h=4382bfb143714d4bf646e6f19a5c55331fd8b509;hp=ec2579b000a7f767002a17bea69707c4f2a9b0af;hb=6390489a55d6980fdff6913deda5ac240960060d;hpb=74b896713cc840c87c53334587036870ea7fb8f7

diff --git a/opensc.spec b/opensc.spec
index ec2579b..4382bfb 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,22 +1,36 @@
 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.7.0
-Release:	1
+Version:	0.9.6
+Release:	3
+Epoch:		0
 License:	LGPL
 Group:		Applications
 Source0:	http://www.opensc.org/files/%{name}-%{version}.tar.gz
+# Source0-md5:	38fdd64566cc6fc83338d659e816b4fb
+Patch0:		%{name}-libdir.patch
+Patch1:		%{name}-segv.patch
+Patch2:		%{name}-explorer-debug.patch
+Patch3:		%{name}-gcc4.patch
 URL:		http://www.opensc.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
+BuildRequires:	libassuan-devel >= 1:0.6.0
 BuildRequires:	libtool >= 1:1.4.2-9
-BUildRequires:	openldap-devel
-BuildRequires:	openssl-devel
+BuildRequires:	openldap-devel
+BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	openct-devel
 BuildRequires:	pam-devel
 BuildRequires:	pcsc-lite-devel
+BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# datadir is used for config files and (editable) profiles
+%define		_datadir	/etc
+%define		_sysconfdir	/etc/opensc
+%define		mozplugindir	/usr/%{_lib}/mozilla/plugins
+
 %description
 libopensc is a library for accessing SmartCard devices using PC/SC
 Lite middleware package. It is also the core library of the OpenSC
@@ -40,7 +54,10 @@ IDentity) produkowanych przez Setec.
 Summary:	OpenSC development files
 Summary(pl):	Pliki dla programistów u¿ywaj±cych OpenSC
 Group:		Development/Tools
-Requires:	%{name}-libs = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	openct-devel
+Requires:	openssl-devel
+Requires:	pcsc-lite-devel
 
 %description devel
 OpenSC development files.
@@ -52,7 +69,7 @@ Pliki dla programist
 Summary:	Static OpenSC libraries
 Summary(pl):	Bibloteki statyczne OpenSC
 Group:		Development/Tools
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static OpenSC libraries.
@@ -60,38 +77,75 @@ Static OpenSC libraries.
 %description static -l pl
 Statyczne biblioteki OpenSC.
 
-%package -n pam_opensc
+%package -n pam-pam_opensc
 Summary:	OpenSC module for PAM
 Summary(pl):	Modu³ PAM OpenSC
 License:	GPL
 Group:		Base
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	pam_opensc
 
-%description -n pam_opensc
+%description -n pam-pam_opensc
 OpenSC module for PAM.
 
-%description -n pam_opensc -l pl
+%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
+Group:		X11/Applications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	pinentry-gtk
+
+%description -n mozilla-plugin-opensc
+OpenSC Signer plugin for Mozilla.
+
+%description -n mozilla-plugin-opensc -l pl
+Wtyczka OpenSC Signer dla Mozilli.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--with-pin-entry=/usr/bin/pinentry-gtk \
+	--with-plugin-dir="%{mozplugindir}"
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{mozplugindir}
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/%{_lib}
+mv -f $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/%{_lib}
 
-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
+install etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install etc/scldap.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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,40 +155,54 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README README.signer THANKS TODO docs/pkcs-15v1_1.asn
+%doc ANNOUNCE ChangeLog NEWS docs/{pkcs-15v1_1.asn,opensc.{html,css}}
+%attr(755,root,root) %{_bindir}/cardos-info
 %attr(755,root,root) %{_bindir}/cryptoflex-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/opensc-pkcs11.so
+%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
 %dir %{_datadir}/opensc
-%{_datadir}/opensc/*.profile
-%{_mandir}/man[157]/pkcs15*
+%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/opensc-explorer.1*
+%{_mandir}/man1/opensc-tool.1*
+%{_mandir}/man1/pkcs11-tool.1*
+%{_mandir}/man1/pkcs15-*.1*
+%{_mandir}/man[57]/*
 
 %files devel
 %defattr(644,root,root,755)
 %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}/libopensc.la
-%{_libdir}/libpkcs15init.la
-%{_libdir}/libscconf.la
-%{_libdir}/libscldap.la
-%{_libdir}/libscrandom.a
+%{_libdir}/lib*.la
 %{_includedir}/opensc
+%{_pkgconfigdir}/*.pc
+%{_mandir}/man1/opensc-config.1*
+%{_mandir}/man3/*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libopensc.a
-%{_libdir}/libpkcs15init.a
-%{_libdir}/libscconf.a
-%{_libdir}/libscldap.a
+%{_libdir}/lib*.a
+
+%files -n pam-pam_opensc
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/security/pam_opensc.so
 
-%files -n pam_opensc
+%files -n mozilla-plugin-opensc
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/security/pam_opensc.so
+%attr(755,root,root) %{mozplugindir}/opensc-signer.so