X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=opensc.spec;h=851dc846d17dfcdde015d89e39be63fd5d42f40b;hb=b2f27844a10848323766a941f052b58e83ce64f5;hp=1d36d2d1d2009c0834fffb45d3b71bd62f6a26b1;hpb=0a3c046b477113ecf9e11ac9e0552442cb1431fa;p=packages%2Fopensc.git

diff --git a/opensc.spec b/opensc.spec
index 1d36d2d..851dc84 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,22 +1,19 @@
 #
 # Conditional build:
-%bcond_with		openct	# use PCSC directly, without OpenCT support
-
+%bcond_with	openct		# use OpenCT instead of PC/SC for reader access
+%bcond_without	openpace	# OpenPACE support
+#
 Summary:	OpenSC library - for accessing SmartCard devices using PC/SC Lite
 Summary(pl.UTF-8):	Biblioteka OpenSC - do korzystania z kart procesorowych przy użyciu PC/SC Lite
 Name:		opensc
-Version:	0.12.0
+Version:	0.17.0
 Release:	2
-Epoch:		0
 License:	LGPL v2.1+
 Group:		Applications
-Source0:	http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
-# Source0-md5:	630fa3b8717d22a1d069d120153a0c52
-Source1:	%{name}-initramfs-hook
-Source2:	%{name}-initramfs-local-bottom
-Source3:	%{name}-initramfs-local-top
-Source4:	%{name}-initramfs-README
-URL:		http://www.opensc-project.org/
+#Source0Download: https://github.com/OpenSC/OpenSC/releases
+Source0:	https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	fc502ed7753f950b8e2a18a476d0cd52
+URL:		https://github.com/OpenSC/OpenSC/wiki
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
 BuildRequires:	docbook-style-xsl
@@ -24,14 +21,16 @@ BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libxslt-progs
 %{?with_openct:BuildRequires:	openct-devel}
-BuildRequires:	openldap-devel >= 2.4.6
+%{?with_openpace:BuildRequires:	openpace-devel >= 0.9}
 BuildRequires:	openssl-devel >= 0.9.7d
-%{!?with_openct:BuildRequires:	pcsc-lite-devel >= 1.6.0}
+%{!?with_openct:BuildRequires:	pcsc-lite-devel >= 1.8.22}
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.364
 BuildRequires:	zlib-devel
-%{!?with_openct:Requires:	pcsc-lite-libs >= 1.6.0}
+Requires:	filesystem >= 4.0-28
+%{?with_openpace:Requires:	openpace >= 0.9}
+%{!?with_openct:Requires:	pcsc-lite-libs >= 1.8.22}
 Obsoletes:	browser-plugin-opensc
 Obsoletes:	mozilla-plugin-opensc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,11 +62,12 @@ IDentity) produkowanych przez Setec.
 Summary:	OpenSC development files
 Summary(pl.UTF-8):	Pliki dla programistów używających OpenSC
 Group:		Development/Tools
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	libltdl-devel
 %{?with_openct:Requires:	openct-devel}
-Requires:	openssl-devel
-%{!?with_openct:Requires:	pcsc-lite-devel >= 1.6.0}
+Requires:	openssl-devel >= 0.9.7d
+%{!?with_openct:Requires:	pcsc-lite-devel >= 1.8.22}
+Requires:	zlib-devel
 
 %description devel
 OpenSC development files.
@@ -79,7 +79,7 @@ Pliki dla programistów używających OpenSC.
 Summary:	Static OpenSC library
 Summary(pl.UTF-8):	Bibloteka statyczna OpenSC
 Group:		Development/Tools
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static OpenSC library.
@@ -87,22 +87,20 @@ Static OpenSC library.
 %description static -l pl.UTF-8
 Biblioteka statyczna OpenSC.
 
-%package initramfs
-Summary:	OpenSC support scripts for initramfs-tools
-Summary(pl.UTF-8):	Skrypty dla initramfs-tools ze wsparciem dla OpenSC
-Group:		Base
+%package -n bash-completion-opensc
+Summary:	Bash completion for OpenSC commands
+Summary(pl.UTF-8):	Bashowe uzupełnianie parametrów poleceń OpenSC
+Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
-Requires:	initramfs-tools
 
-%description initramfs
-OpenSC support scripts for initramfs-tools.
+%description -n bash-completion-opensc
+Bash completion for OpenSC commands.
 
-%description initramfs -l pl.UTF-8
-Skrypty dla initramfs-tools ze wsparciem dla OpenSC.
+%description -n bash-completion-opensc -l pl.UTF-8
+Bashowe uzupełnianie parametrów poleceń OpenSC.
 
 %prep
 %setup -q
-cp -p %{SOURCE4} README.initramfs
 
 %build
 %{__libtoolize}
@@ -113,6 +111,8 @@ cp -p %{SOURCE4} README.initramfs
 %configure \
 	%{?with_openct:--enable-openct --disable-pcsc} \
 	%{!?with_openct:--enable-pcsc --disable-openct} \
+	%{!?with_openpace:--disable-openpace} \
+	--disable-silent-rules \
 	--enable-doc \
 	--with-pcsc-provider=%{_libdir}/libpcsclite.so.1
 
@@ -120,18 +120,18 @@ cp -p %{SOURCE4} README.initramfs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{hooks,scripts/local-{bottom,top}}
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_libdir}/pkcs11}
 
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/opensc
-install -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-bottom/opensc
-install -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/opensc
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	completiondir=/etc/bash_completion.d
 
 # not needed (dlopened by soname)
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/{onepin-opensc-pkcs11,opensc-pkcs11,pkcs11-spy}.la
+# API not exported
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{opensc,smm-local}.la
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -141,11 +141,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS README doc/html.out/tools.html
+%doc NEWS README doc/tools/tools.html
 %attr(755,root,root) %{_bindir}/cardos-tool
 %attr(755,root,root) %{_bindir}/cryptoflex-tool
+%attr(755,root,root) %{_bindir}/dnie-tool
 %attr(755,root,root) %{_bindir}/eidenv
+%attr(755,root,root) %{_bindir}/gids-tool
+%attr(755,root,root) %{_bindir}/iasecc-tool
 %attr(755,root,root) %{_bindir}/netkey-tool
+%attr(755,root,root) %{_bindir}/npa-tool
+%attr(755,root,root) %{_bindir}/openpgp-tool
 %attr(755,root,root) %{_bindir}/opensc-explorer
 %attr(755,root,root) %{_bindir}/opensc-tool
 %attr(755,root,root) %{_bindir}/piv-tool
@@ -153,45 +158,71 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pkcs15-crypt
 %attr(755,root,root) %{_bindir}/pkcs15-init
 %attr(755,root,root) %{_bindir}/pkcs15-tool
-%attr(755,root,root) %{_bindir}/rutoken-tool
+%attr(755,root,root) %{_bindir}/sc-hsm-tool
 %attr(755,root,root) %{_bindir}/westcos-tool
 %attr(755,root,root) %{_libdir}/libopensc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libopensc.so.3
+%attr(755,root,root) %ghost %{_libdir}/libopensc.so.5
+%attr(755,root,root) %{_libdir}/libsmm-local.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsmm-local.so.5
 # 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}/opensc.conf
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/opensc/*.profile
+%if %{with openpace}
+/etc/eac/cvc/DESRCACC100001
+%endif
 %{_mandir}/man1/cardos-tool.1*
 %{_mandir}/man1/cryptoflex-tool.1*
+%{_mandir}/man1/dnie-tool.1*
+%{_mandir}/man1/eidenv.1*
+%{_mandir}/man1/gids-tool.1*
+%{_mandir}/man1/iasecc-tool.1*
 %{_mandir}/man1/netkey-tool.1*
+%{_mandir}/man1/npa-tool.1*
+%{_mandir}/man1/openpgp-tool.1*
 %{_mandir}/man1/opensc-explorer.1*
 %{_mandir}/man1/opensc-tool.1*
+%{_mandir}/man1/piv-tool.1*
 %{_mandir}/man1/pkcs11-tool.1*
 %{_mandir}/man1/pkcs15-crypt.1*
 %{_mandir}/man1/pkcs15-init.1*
 %{_mandir}/man1/pkcs15-tool.1*
+%{_mandir}/man1/sc-hsm-tool.1*
 %{_mandir}/man1/westcos-tool.1*
 %{_mandir}/man5/pkcs15-profile.5*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libopensc.so
-%{_libdir}/libopensc.la
+%attr(755,root,root) %{_libdir}/libsmm-local.so
+%{_pkgconfigdir}/opensc-pkcs11.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libopensc.a
 
-%files initramfs
+%files -n bash-completion-opensc
 %defattr(644,root,root,755)
-%doc README.initramfs
-%attr(755,root,root) %{_datadir}/initramfs-tools/hooks/opensc
-%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/local-top/opensc
-%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/local-bottom/opensc
+/etc/bash_completion.d/cardos-tool
+/etc/bash_completion.d/cryptoflex-tool
+/etc/bash_completion.d/dnie-tool
+/etc/bash_completion.d/eidenv
+/etc/bash_completion.d/gids-tool
+/etc/bash_completion.d/iasecc-tool
+/etc/bash_completion.d/netkey-tool
+/etc/bash_completion.d/openpgp-tool
+/etc/bash_completion.d/opensc-explorer
+/etc/bash_completion.d/opensc-tool
+/etc/bash_completion.d/piv-tool
+/etc/bash_completion.d/pkcs11-tool
+/etc/bash_completion.d/pkcs15-crypt
+/etc/bash_completion.d/pkcs15-init
+/etc/bash_completion.d/pkcs15-tool
+/etc/bash_completion.d/sc-hsm-tool
+/etc/bash_completion.d/westcos-tool