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

diff --git a/opensc.spec b/opensc.spec
index 15bc96f..b9cab72 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,29 +1,35 @@
 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.8.1
-Release:	1
+Version:	0.9.6
+Release:	2
+Epoch:		0
 License:	LGPL
 Group:		Applications
 Source0:	http://www.opensc.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	2b64a8e629bd28a00e707e35fd3eb9c7
+# 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:	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	%{_sysconfdir}
-%define		mozplugindir	/usr/lib/mozilla/plugins
+%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
@@ -48,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} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	openct-devel
+Requires:	openssl-devel
+Requires:	pcsc-lite-devel
 
 %description devel
 OpenSC development files.
@@ -60,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.
@@ -68,26 +77,25 @@ 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
-# libassuan is GPL
-License:	GPL
 Group:		X11/Applications
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	pinentry-gtk
 
 %description -n mozilla-plugin-opensc
@@ -99,11 +107,15 @@ Wtyczka OpenSC Signer dla Mozilli.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--with-pin-entry=/usr/bin/pinentry-gtk \
@@ -118,22 +130,22 @@ 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
+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%{_datadir}/opensc/opensc.conf{.example,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/opensc/scldap.conf{.example,}
+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.{a,la} \
+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}
+	$RPM_BUILD_ROOT/%{_lib}/security/pam_opensc.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,25 +164,28 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%config(noreplace) %verify(not size mtime md5) %{_datadir}/opensc/*.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/opensc-explorer.1*
 %{_mandir}/man1/opensc-tool.1*
-%{_mandir}/man1/pkcs15*
+%{_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
@@ -184,9 +199,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%files -n pam_opensc
+%files -n pam-pam_opensc
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/security/pam_opensc.so
+%attr(755,root,root) /%{_lib}/security/pam_opensc.so
 
 %files -n mozilla-plugin-opensc
 %defattr(644,root,root,755)