X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopensc.git;a=blobdiff_plain;f=opensc.spec;h=d52ae0e5a0a898ff4ef6ae58a9afd4dfbc00cfde;hp=59254882adf1af4b6696abf6efbc61f179225eff;hb=9c0288b51e560f100bf9c4bacbdf18802e808aec;hpb=afd37b22b1b8c85a1d2e8fdfe58bc21d649c2848

diff --git a/opensc.spec b/opensc.spec
index 5925488..d52ae0e 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,26 +1,34 @@
 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
+Version:	0.10.1
 Release:	1
+Epoch:		0
 License:	LGPL
 Group:		Applications
-Source0:	http://www.opensc.org/files/%{name}-%{version}.tar.gz
-Patch0:		%{name}-nolibs.patch
-Patch1:		%{name}-segv.patch
-Patch2:		%{name}-lt.patch
-Patch3:		%{name}-ssl0.9.7.patch
-URL:		http://www.opensc.org/
+Source0:	http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
+# Source0-md5:	5549c7c339775356784837887750d232
+Patch0:		%{name}-explorer-debug.patch
+Patch1:		%{name}-libassuan.patch
+URL:		http://www.opensc-project.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
+BuildRequires:	libassuan-devel >= 1:0.6.0
+BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1:1.4.2-9
-BUildRequires:	openldap-devel
-BuildRequires:	openssl-devel
-BuildRequires:	pam-devel
+BuildRequires:	openldap-devel
+BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	openct-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
@@ -44,7 +52,11 @@ 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:	libltdl-devel
+Requires:	openct-devel
+Requires:	openssl-devel
+Requires:	pcsc-lite-devel
 
 %description devel
 OpenSC development files.
@@ -56,7 +68,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.
@@ -64,45 +76,53 @@ Static OpenSC libraries.
 %description static -l pl
 Statyczne biblioteki OpenSC.
 
-%package -n pam_opensc
-Summary:	OpenSC module for PAM
-Summary(pl):	Modu³ PAM OpenSC
-License:	GPL
-Group:		Base
-Requires:	%{name} = %{version}
+%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 pam_opensc
-OpenSC module for PAM.
+%description -n mozilla-plugin-opensc
+OpenSC Signer plugin for Mozilla.
 
-%description -n pam_opensc -l pl
-Modu³ PAM OpenSC.
+%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}
+%{__aclocal} -I 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
+# 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}
 
-install -d $RPM_BUILD_ROOT/lib
-mv -f $RPM_BUILD_ROOT%{_libdir}/security $RPM_BUILD_ROOT/lib
+# default config
+install etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-# libscam.a is broken (contains libscrandom.a) and not needed (static module)
-rm -f $RPM_BUILD_ROOT%{_libdir}/libscam.{a,la}
+# useless (dlopened by *.so)
+rm -f $RPM_BUILD_ROOT%{_libdir}/{opensc,pkcs11}-*.{a,la} \
+	$RPM_BUILD_ROOT%{_libdir}/opensc/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,40 +132,51 @@ 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 NEWS README doc/{*.{html,css},html/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}/pkcs11-tool
 %attr(755,root,root) %{_bindir}/pkcs15-*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %{_libdir}/libscam.so
-%dir %{_libdir}/pkcs11
-%attr(755,root,root) %{_libdir}/pkcs11/opensc-pkcs11.so
+%attr(755,root,root) %{_libdir}/opensc-pkcs11.so
+%attr(755,root,root) %{_libdir}/pkcs11-spy.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/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]/*
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/html/api.html
 %attr(755,root,root) %{_bindir}/opensc-config
 %attr(755,root,root) %{_libdir}/libopensc.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
 %{_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
 
-%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