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

diff --git a/opensc.spec b/opensc.spec
index a9cd947..2277e19 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,38 +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.11.0
-Release:	2
+Version:	0.11.5
+Release:	1
 Epoch:		0
-License:	LGPL
+License:	LGPL v2.1+
 Group:		Applications
 Source0:	http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
-# Source0-md5:	be9cced6c703253baf78ccd9970679fa
-Patch0:		%{name}-explorer-debug.patch
-Patch1:		%{name}-libassuan.patch
+# Source0-md5:	bcb65ead86dc477866e59f9a45bc69a4
 URL:		http://www.opensc-project.org/
-BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake
+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:	openct-devel
-BuildRequires:	openldap-devel
+BuildRequires:	openldap-devel >= 2.4.6
 BuildRequires:	openssl-devel >= 0.9.7d
-BuildRequires:	pcsc-lite-devel
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.236
+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		_plugindir	%{_libdir}/browser-plugins
-
-# TODO: galeon and skipstone.
-# use macro, otherwise extra LF inserted along with the ifarch
-%define	browsers mozilla, mozilla-firefox, konqueror, opera, seamonkey
 
 %description
 libopensc is a library for accessing SmartCard devices using PC/SC
@@ -43,19 +36,19 @@ 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
@@ -66,28 +59,29 @@ 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 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:	browser-plugins >= 2.0
 Requires:	browser-plugins(%{_target_base_arch})
-Requires:	pinentry-gtk
+Requires:	pinentry >= 0.7.5-2
 Provides:	mozilla-plugin-opensc
 Obsoletes:	mozilla-plugin-opensc
 
@@ -96,44 +90,46 @@ OpenSC Signer browser plugin.
 
 Supported browsers: %{browsers}.
 
-%description -n browser-plugin-opensc -l pl
-Wtyczka OpenSC Signer dla przegl±darek.
+%description -n browser-plugin-opensc -l pl.UTF-8
+Wtyczka OpenSC Signer dla przeglądarek.
 
-Obs³ugiwane przegl±darki: %{browsers}.
+Obsługiwane przeglądarki: %{browsers}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal} -I aclocal
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-pin-entry=/usr/bin/pinentry-gtk \
-	--with-plugin-dir="%{_plugindir}"
+	--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%{_plugindir}
+install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # just install instead of symlinking
-rm -f $RPM_BUILD_ROOT%{_plugindir}/opensc-signer.so
-mv -f $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{_plugindir}
+%{__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}
 
 # useless (dlopened by *.so)
-rm -f $RPM_BUILD_ROOT%{_libdir}/{opensc,pkcs11}-*.{a,la} \
+rm -f $RPM_BUILD_ROOT%{_libdir}/{onepin-opensc,opensc,pkcs11}-*.{a,la} \
 	$RPM_BUILD_ROOT%{_libdir}/opensc/*.{a,la}
 
 %clean
@@ -142,44 +138,17 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%triggerin -n browser-plugin-opensc -- mozilla-firefox
-%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins opensc-signer.so
-
-%triggerun -n browser-plugin-opensc -- mozilla-firefox
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins opensc-signer.so
-
-%triggerin -n browser-plugin-opensc -- mozilla
-%nsplugin_install -d %{_libdir}/mozilla/plugins opensc-signer.so
-
-%triggerun -n browser-plugin-opensc -- mozilla
-%nsplugin_uninstall -d %{_libdir}/mozilla/plugins opensc-signer.so
-
-%triggerin -n browser-plugin-opensc -- opera
-%nsplugin_install -d %{_libdir}/opera/plugins opensc-signer.so
-
-%triggerun -n browser-plugin-opensc -- opera
-%nsplugin_uninstall -d %{_libdir}/opera/plugins opensc-signer.so
-
-%triggerin -n browser-plugin-opensc -- konqueror
-%nsplugin_install -d %{_libdir}/kde3/plugins/konqueror opensc-signer.so
-
-%triggerun -n browser-plugin-opensc -- konqueror
-%nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror opensc-signer.so
-
-%triggerin -n browser-plugin-opensc -- seamonkey
-%nsplugin_install -d %{_libdir}/seamonkey/plugins opensc-signer.so
-
-%triggerun -n browser-plugin-opensc -- seamonkey
-%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins opensc-signer.so
+%post	-n browser-plugin-opensc
+%update_browser_plugins
 
-# as rpm removes the old obsoleted package files after the triggers
-# are ran, add another trigger to make the links there.
-%triggerpostun -n browser-plugin-opensc -- mozilla-plugin-opensc
-%nsplugin_install -f -d %{_libdir}/mozilla/plugins opensc-signer.so
+%postun	-n browser-plugin-opensc
+if [ "$1" = "0" ]; then
+        %update_browser_plugins
+fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README doc/ChangeLog doc/{*.{html,css},html/tools.html}
+%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
@@ -189,9 +158,21 @@ rm -rf $RPM_BUILD_ROOT
 %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) %{_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 %{_datadir}/opensc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/opensc/*.profile
@@ -202,11 +183,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_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/api.html
+%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}/libpkcs15init.so
@@ -215,9 +196,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_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)
@@ -227,4 +210,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n browser-plugin-opensc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_plugindir}/opensc-signer.so
+%attr(755,root,root) %{_browserpluginsdir}/opensc-signer.so