From: Artur Frysiak <artur@frysiak.net>
Date: Wed, 8 Oct 2003 11:03:53 +0000 (+0000)
Subject: - updated to 0.8.1
X-Git-Tag: auto/ac/opensc-0_8_1-2~4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopensc.git;a=commitdiff_plain;h=e03846a0833614fbce52fe01c93be0cd32e10e41

- updated to 0.8.1

Changed files:
    opensc-assuan.patch -> 1.2
    opensc-libdir.patch -> 1.2
    opensc-nolibs.patch -> 1.3
    opensc.spec -> 1.16
---

diff --git a/opensc-assuan.patch b/opensc-assuan.patch
deleted file mode 100644
index c1028be..0000000
--- a/opensc-assuan.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opensc-0.8.0/src/openscd/commands.c.orig	Thu Jul 24 12:00:56 2003
-+++ opensc-0.8.0/src/openscd/commands.c	Thu Aug 21 13:55:19 2003
-@@ -209,7 +209,7 @@
- 
- 		if (cmd_id == 0)
-                         cmd_id = ASSUAN_CMD_USER + j++;
--		r = assuan_register_command(assuan_ctx, cmd_id,
-+		r = assuan_register_command(assuan_ctx,
- 					    ctable[i].name, ctable[i].handler);
- 		if (r)
- 			return r;
diff --git a/opensc-libdir.patch b/opensc-libdir.patch
index 008bd14..ef36847 100644
--- a/opensc-libdir.patch
+++ b/opensc-libdir.patch
@@ -1,21 +1,21 @@
---- opensc-0.8.0/src/pkcs11/Makefile.am.orig	Fri Aug 15 10:45:23 2003
-+++ opensc-0.8.0/src/pkcs11/Makefile.am	Thu Aug 21 13:13:26 2003
+--- opensc-0.8.1/src/pkcs11/Makefile.am.wiget	2003-09-30 09:11:33.000000000 +0200
++++ opensc-0.8.1/src/pkcs11/Makefile.am	2003-10-08 12:17:05.944565027 +0200
 @@ -1,7 +1,7 @@
  # Process this file with automake to create Makefile.in
  
- bundledir = $(BUNDLEDIR)
+ bundledir = @BUNDLEDIR@/pkcs11
 -libdir = @libdir@/pkcs11
-+pkcs11dir = @libdir@/pkcs11
++pksc11dir = @libdir@/pkcs11
+ includedir = @includedir@/opensc
  
  MAINTAINERCLEANFILES = Makefile.in
- 
-@@ -16,7 +16,8 @@
+@@ -17,7 +17,8 @@
  	framework-pkcs15init.c debug.c
  INC = sc-pkcs11.h
  
--lib_LTLIBRARIES = opensc-pkcs11.la libpkcs11.la
+-lib_LTLIBRARIES = opensc-pkcs11.la libpkcs11.la pkcs11-spy.la
 +lib_LTLIBRARIES = libpkcs11.la
-+pkcs11_LTLIBRARIES = opensc-pkcs11.la
++pksc11_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la
  
  opensc_pkcs11_la_SOURCES = $(SRC) $(INC)
  opensc_pkcs11_la_LDFLAGS = -module -avoid-version
diff --git a/opensc-nolibs.patch b/opensc-nolibs.patch
deleted file mode 100644
index 58f9501..0000000
--- a/opensc-nolibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opensc-0.8.0/configure.in.orig	Sun Jun  2 22:56:18 2002
-+++ opensc-0.8.0/configure.in	Tue Mar 11 13:47:17 2003
-@@ -379,8 +379,6 @@
-   LIBS="$t_oldLibs"
- fi
- 
--# Always link lib{socket,nsl,resolv) if found, sigh.
--LIBS="$LIBS $LIBSOCKET $LIBRESOLV"
- 
- AC_ARG_WITH(flex-dir,
- 	[  --with-flex-dir=PATH    Specify path to flex installation],
diff --git a/opensc.spec b/opensc.spec
index 671d78f..15bc96f 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -1,15 +1,13 @@
 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.0
+Version:	0.8.1
 Release:	1
 License:	LGPL
 Group:		Applications
 Source0:	http://www.opensc.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	46bb22935040816a0d741b5f76ed4b81
-Patch0:		%{name}-nolibs.patch
-Patch1:		%{name}-libdir.patch
-Patch2:		%{name}-assuan.patch
+# Source0-md5:	2b64a8e629bd28a00e707e35fd3eb9c7
+Patch0:		%{name}-libdir.patch
 URL:		http://www.opensc.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -17,6 +15,7 @@ BuildRequires:	libassuan-devel >= 1:0.6.0
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
+BuildRequires:	openct-devel
 BuildRequires:	pam-devel
 BuildRequires:	pcsc-lite-devel
 BuildRequires:	readline-devel
@@ -100,8 +99,6 @@ Wtyczka OpenSC Signer dla Mozilli.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -134,8 +131,8 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/opensc/scldap.conf{.example,}
 
 # useless (dlopened by *.so)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libscam.{a,la} \
-	$RPM_BUILD_ROOT%{_libdir}/opensc/opensc-signer.{a,la} \
-	$RPM_BUILD_ROOT%{_libdir}/pkcs11/opensc-pkcs11.{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}
 
 %clean
@@ -157,6 +154,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libscam.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