SPECS: opensc.spec - updated to 0.11.5 - switched to browser-plugins v2 - s...

qboosh qboosh at pld-linux.org
Tue Aug 26 19:15:11 CEST 2008 

Author: qboosh                       Date: Tue Aug 26 17:15:11 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.11.5
- switched to browser-plugins v2
- switched to /usr/bin/pinentry

---- Files affected:
SPECS:
   opensc.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/opensc.spec
diff -u SPECS/opensc.spec:1.52 SPECS/opensc.spec:1.53
--- SPECS/opensc.spec:1.52	Sat Jun 14 12:15:09 2008
+++ SPECS/opensc.spec	Tue Aug 26 19:15:06 2008
@@ -2,36 +2,31 @@
 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.11.4
-Release:	3
+Version:	0.11.5
+Release:	1
 Epoch:		0
 License:	LGPL v2.1+
 Group:		Applications
 Source0:	http://www.opensc-project.org/files/opensc/%{name}-%{version}.tar.gz
-# Source0-md5:	2031aa617be609d50d014d5d370bb8a2
+# 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 >= 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
@@ -85,8 +80,9 @@
 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
 
@@ -104,28 +100,31 @@
 %setup -q
 
 %build
-touch config.rpath
 %{__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}
@@ -140,44 +139,17 @@
 %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
+%post	-n browser-plugin-opensc
+%update_browser_plugins
 
-%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
+%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
@@ -187,15 +159,21 @@
 %attr(755,root,root) %{_bindir}/piv-tool
 %attr(755,root,root) %{_bindir}/pkcs11-tool
 %attr(755,root,root) %{_bindir}/pkcs15-*
+%attr(755,root,root) %{_bindir}/rutoken-tool
 %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) %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
@@ -210,7 +188,7 @@
 
 %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
@@ -233,7 +211,7 @@
 
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -241,6 +219,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2008/08/26 17:15:06  qboosh
+- updated to 0.11.5
+- switched to browser-plugins v2
+- switched to /usr/bin/pinentry
+
 Revision 1.52  2008/06/14 10:15:09  arekm
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/opensc.spec?r1=1.52&r2=1.53&f=u

More information about the pld-cvs-commit mailing list