X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopensc.git;a=blobdiff_plain;f=opensc.spec;h=2277e19fbf8acba55ed680b8a83f5a878e6f5635;hp=b9cab7234e8ce0628b9809aa95219f278d33b329;hb=676229f884d762b6139a319e4093e6e8ac51025a;hpb=49e68077c781756b11dd3ed3a822409976ee0a3b

diff --git a/opensc.spec b/opensc.spec
index b9cab72..2277e19 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,35 +1,31 @@
 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
+Summary(pl.UTF-8):	Biblioteka OpenSC - do korzystania z kart procesorowych przy użyciu PC/SC Lite
 Name:		opensc
-Version:	0.9.6
-Release:	2
+Version:	0.11.5
+Release:	1
 Epoch:		0
-License:	LGPL
+License:	LGPL v2.1+
 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
+Source0:	http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
+# Source0-md5:	bcb65ead86dc477866e59f9a45bc69a4
+URL:		http://www.opensc-project.org/
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.10
 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:	openldap-devel >= 2.4.6
+BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
+BuildRequires:	rpmbuild(macros) >= 1.364
+BuildRequires:	zlib-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
@@ -40,21 +36,22 @@ using private keys on the SmartCard is at the moment possible only
 with PKCS#15 compatible cards, such as the FINEID (Finnish Electronic
 IDentity) card manufactured by Setec.
 
-%description -l pl
+%description -l pl.UTF-8
 libopensc to biblioteka do korzystania z kart procesorowych przy
-u¿yciu pakietu warstwy po¶redniej PC/SC Lite. Jest to tak¿e podstawowa
-biblioteka projektu OpenSC. Podstawowa funkcjonalno¶æ (np. SELECT
-FILE, READ BINARY) powinna dzia³aæ tak¿e z dowoln± kart± procesorow±
-zgodn± z ISO-7816-4. Szyfrowanie i odszyfrowywanie przy u¿yciu
-prywatnych kluczy na karcie na razie jest mo¿liwe tylko przy u¿yciu
+użyciu pakietu warstwy pośredniej PC/SC Lite. Jest to także podstawowa
+biblioteka projektu OpenSC. Podstawowa funkcjonalność (np. SELECT
+FILE, READ BINARY) powinna działać także z dowolną kartą procesorową
+zgodną z ISO-7816-4. Szyfrowanie i odszyfrowywanie przy użyciu
+prywatnych kluczy na karcie na razie jest możliwe tylko przy użyciu
 kart kompatybilnych z PKCS#16, takich jak FINEID (Finnish Electronic
 IDentity) produkowanych przez Setec.
 
 %package devel
 Summary:	OpenSC development files
-Summary(pl):	Pliki dla programistów u¿ywaj±cych OpenSC
+Summary(pl.UTF-8):	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
@@ -62,90 +59,78 @@ Requires:	pcsc-lite-devel
 %description devel
 OpenSC development files.
 
-%description devel -l pl
-Pliki dla programistów u¿ywaj±cych OpenSC.
+%description devel -l pl.UTF-8
+Pliki dla programistów używających OpenSC.
 
 %package static
 Summary:	Static OpenSC libraries
-Summary(pl):	Bibloteki statyczne OpenSC
+Summary(pl.UTF-8):	Bibloteki statyczne OpenSC
 Group:		Development/Tools
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static OpenSC libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 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
+%package -n browser-plugin-opensc
 Summary:	OpenSC Signer plugin for Mozilla
-Summary(pl):	Wtyczka OpenSC Signer dla Mozilli
+Summary(pl.UTF-8):	Wtyczka OpenSC Signer dla Mozilli
 Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	pinentry-gtk
+Requires:	browser-plugins >= 2.0
+Requires:	browser-plugins(%{_target_base_arch})
+Requires:	pinentry >= 0.7.5-2
+Provides:	mozilla-plugin-opensc
+Obsoletes:	mozilla-plugin-opensc
+
+%description -n browser-plugin-opensc
+OpenSC Signer browser plugin.
 
-%description -n mozilla-plugin-opensc
-OpenSC Signer plugin for Mozilla.
+Supported browsers: %{browsers}.
 
-%description -n mozilla-plugin-opensc -l pl
-Wtyczka OpenSC Signer dla Mozilli.
+%description -n browser-plugin-opensc -l pl.UTF-8
+Wtyczka OpenSC Signer dla przeglądarek.
+
+Obsługiwane przeglądarki: %{browsers}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-pin-entry=/usr/bin/pinentry-gtk \
-	--with-plugin-dir="%{mozplugindir}"
+	--enable-openct \
+	--enable-nsplugin \
+	--enable-pcsc \
+	--with-pcsc-provider=%{_libdir}/libpcsclite.so.1 \
+	--with-pin-entry=/usr/bin/pinentry \
+	--with-plugindir=%{_browserpluginsdir}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{mozplugindir}
+install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
 
 %{__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}
+%{__rm} $RPM_BUILD_ROOT%{_browserpluginsdir}/opensc-signer.so
+mv -f $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 
 # 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}
+rm -f $RPM_BUILD_ROOT%{_libdir}/{onepin-opensc,opensc,pkcs11}-*.{a,la} \
+	$RPM_BUILD_ROOT%{_libdir}/opensc/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -153,56 +138,76 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	-n browser-plugin-opensc
+%update_browser_plugins
+
+%postun	-n browser-plugin-opensc
+if [ "$1" = "0" ]; then
+        %update_browser_plugins
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE ChangeLog NEWS docs/{pkcs-15v1_1.asn,opensc.{html,css}}
+%doc NEWS README doc/nonpersistent/{ChangeLog,wiki.out} doc/html.out/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}/piv-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) %{_bindir}/rutoken-tool
+%attr(755,root,root) %{_libdir}/libopensc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopensc.so.2
+%attr(755,root,root) %{_libdir}/libpkcs15init.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpkcs15init.so.2
+%attr(755,root,root) %{_libdir}/libscconf.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libscconf.so.2
+# PKCS11 modules
+%attr(755,root,root) %{_libdir}/onepin-opensc-pkcs11.so
 %attr(755,root,root) %{_libdir}/opensc-pkcs11.so
+%attr(755,root,root) %{_libdir}/pkcs11-spy.so
 %dir %{_libdir}/pkcs11
+%attr(755,root,root) %{_libdir}/pkcs11/onepin-opensc-pkcs11.so
+%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
 %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*
 %{_mandir}/man1/pkcs15-*.1*
-%{_mandir}/man[57]/*
+%{_mandir}/man5/pkcs15-profile.5*
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/html.out/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
+%{_pkgconfigdir}/libopensc.pc
+%{_pkgconfigdir}/libpkcs15init.pc
+%{_pkgconfigdir}/libscconf.pc
 %{_mandir}/man1/opensc-config.1*
-%{_mandir}/man3/*
+%{_mandir}/man3/sc_*.3*
 
 %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
+%files -n browser-plugin-opensc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{mozplugindir}/opensc-signer.so
+%attr(755,root,root) %{_browserpluginsdir}/opensc-signer.so