X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopensc.git;a=blobdiff_plain;f=opensc.spec;h=8a92cbe226c7f6727bd59dfda6cd4cef50c80b66;hp=8859f419e25ed23efad585ed829cb2d4c3cac7c6;hb=0a2e1afa99a34352f8251b09e069623c6da9a2bf;hpb=34f2d3c1250c03fdc97d5a7df60568b32778aa13

diff --git a/opensc.spec b/opensc.spec
index 8859f41..8a92cbe 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,35 +1,38 @@
 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.9.4
+Version:	0.11.1
 Release:	1
 Epoch:		0
 License:	LGPL
 Group:		Applications
-Source0:	http://www.opensc.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	76c18fc9bd9fad9c45396ea81f317551
-Patch0:		%{name}-libdir.patch
-Patch1:		%{name}-shared-ssl.patch
-Patch2:		%{name}-segv.patch
-Patch3:		%{name}-explorer-debug.patch
-URL:		http://www.opensc.org/
+Source0:	http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
+# Source0-md5:	94ce00a6bda38fac10ab06f5d5d1a8c3
+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:	openct-devel
 BuildRequires:	openldap-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
+BuildRequires:	rpmbuild(macros) >= 1.236
 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
+%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
@@ -55,6 +58,7 @@ Summary:	OpenSC development files
 Summary(pl):	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
@@ -77,75 +81,60 @@ Static OpenSC libraries.
 %description static -l pl
 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
 Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	browser-plugins(%{_target_base_arch})
 Requires:	pinentry-gtk
+Provides:	mozilla-plugin-opensc
+Obsoletes:	mozilla-plugin-opensc
+
+%description -n browser-plugin-opensc
+OpenSC Signer browser plugin.
+
+Supported browsers: %{browsers}.
 
-%description -n mozilla-plugin-opensc
-OpenSC Signer plugin for Mozilla.
+%description -n browser-plugin-opensc -l pl
+Wtyczka OpenSC Signer dla przegl±darek.
 
-%description -n mozilla-plugin-opensc -l pl
-Wtyczka OpenSC Signer dla Mozilli.
+Obs³ugiwane przegl±darki: %{browsers}.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I aclocal
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
 	--with-pin-entry=/usr/bin/pinentry-gtk \
-	--with-plugin-dir="%{mozplugindir}"
+	--with-plugin-dir="%{_plugindir}"
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{mozplugindir}
+install -d $RPM_BUILD_ROOT%{_plugindir}
 
 %{__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 -f $RPM_BUILD_ROOT%{_plugindir}/opensc-signer.so
+mv -f $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{_plugindir}
 
 # default config
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf{.example,}
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/scldap.conf{.example,}
+install etc/opensc.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}/{opensc,pkcs11}-*.{a,la} \
+	$RPM_BUILD_ROOT%{_libdir}/opensc/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -153,28 +142,62 @@ 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
+
+# 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
+
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE ChangeLog NEWS docs/{pkcs-15v1_1.asn,opensc.{html,css}}
+%doc NEWS README doc/ChangeLog 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}/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) %{_libdir}/opensc-pkcs11.so
-%dir %{_libdir}/pkcs11
-%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
+%attr(755,root,root) %{_libdir}/pkcs11-spy.so
 %dir %{_datadir}/opensc
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.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/netkey-tool.1*
 %{_mandir}/man1/opensc-explorer.1*
 %{_mandir}/man1/opensc-tool.1*
 %{_mandir}/man1/pkcs11-tool.1*
@@ -183,13 +206,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %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}/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
 %{_mandir}/man1/opensc-config.1*
@@ -197,12 +221,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %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) %{_plugindir}/opensc-signer.so