Hello community,
here is the log from the commit of package pcsc-acr38 for openSUSE:Factory
checked in at Wed Dec 16 15:25:18 CET 2009.
--------
--- pcsc-acr38/pcsc-acr38.changes 2009-04-08 15:29:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/pcsc-acr38/pcsc-acr38.changes 2009-10-07 15:53:09.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Oct 7 15:45:05 CEST 2009 - sbrabec@suse.cz
+
+- Updated to version 1.7.10:
+ * fixed special handling of PPS for old firmware
+ * support for ACS CryptoMate
+ * ported to libusb
+ * other fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ACR38_LINUX_100705_P-ucread.diff
ACR38_LINUX_100709-automake-cleanup.patch
ACR38_LINUX_100709-implicit-declaration.patch
ACR38_LINUX_100709_P.tar.bz2
New:
----
ACR38_LINUX_100710-automake-cleanup.patch
ACR38U_driver_Lnx_1710_P.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-acr38.spec ++++++
--- /var/tmp/diff_new_pack.APPxFY/_old 2009-12-16 15:23:39.000000000 +0100
+++ /var/tmp/diff_new_pack.APPxFY/_new 2009-12-16 15:23:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package pcsc-acr38 (Version 1.7.9)
+# spec file for package pcsc-acr38 (Version 1.7.10)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,22 +19,22 @@
Name: pcsc-acr38
-BuildRequires: pcsc-lite-devel pkg-config
-Version: 1.7.9
-Release: 138
-%define _version 100709_P
+BuildRequires: libusb-devel pcsc-lite-devel pkg-config
+Version: 1.7.10
+Release: 1
+%define _version 100710_P
+%define __version 1710_P
Group: Productivity/Security
-License: GPL v2 or later
+License: GPLv2+
Url: http://www.acs.com.hk/drivers-manual.php?driver=ACR38
Summary: PC/SC IFD Handler for the ACR38 Smart Card Reader
-Source0: ACR38_LINUX_%{_version}.tar.bz2
-Patch1: ACR38_LINUX_100705_P-ucread.diff
+Source: ACR38U_driver_Lnx_%{__version}.tar.bz2
Patch2: ACR38_LINUX_100705_P-usb.diff
-Patch3: ACR38_LINUX_100709-automake-cleanup.patch
-Patch4: ACR38_LINUX_100709-implicit-declaration.patch
+Patch3: ACR38_LINUX_100710-automake-cleanup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: pcsc-lite
Supplements: modalias(usb:v072Fp9000d*dc*dsc*dp*ic*isc*ip*)
+Supplements: modalias(usb:v072Fp9006d*dc*dsc*dp*ic*isc*ip*)
%define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
%description
@@ -52,7 +52,7 @@
Edward Cheung
%package -n libacr38ucontrol0
-License: GPL v2 or later
+License: GPLv2+
Group: System/Libraries
Summary: Library for PC/SC IFD Handler for the ACR38 Smart Card Reader
@@ -71,7 +71,7 @@
Edward Cheung
%package devel
-License: GPL v2 or later
+License: GPLv2+
Group: Development/Libraries/C and C++
Summary: PC/SC IFD Handler for the ACR38 Smart Card Reader
Requires: libacr38ucontrol0 = %{version} pcsc-lite-devel
@@ -93,10 +93,8 @@
%prep
%setup -q -n ACR38_LINUX_%{_version}
mv src/driver/Info.plist src/driver/Info.plist.in
-%patch1
%patch2
%patch3
-%patch4
%build
autoreconf -f -i
++++++ ACR38_LINUX_100709-automake-cleanup.patch -> ACR38_LINUX_100710-automake-cleanup.patch ++++++
--- pcsc-acr38/ACR38_LINUX_100709-automake-cleanup.patch 2007-05-31 13:23:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/pcsc-acr38/ACR38_LINUX_100710-automake-cleanup.patch 2009-10-07 15:53:09.000000000 +0200
@@ -1,23 +1,22 @@
---- Makefile.am
-+++ Makefile.am
-@@ -6,3 +6,5 @@
-
- # -- Top-level Makefile.am --
- SUBDIRS = src/controllib src/driver
-+
-+DISTCHECK_CONFIGURE_FLAGS = --enable-usbdropdir=$$dc_install_base/pcsc/drivers
--- configure.ac
+++ configure.ac
-@@ -2,7 +2,7 @@
+@@ -2,14 +2,11 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
-AC_INIT([ACR38UDriver], [1.0.7.5], edward.cheung@acs.com.hk)
-+AC_INIT([ACR38UDriver], [1.7.9], edward.cheung@acs.com.hk)
++AC_INIT([ACR38UDriver], [1.7.10], edward.cheung@acs.com.hk)
AC_CONFIG_SRCDIR([src/driver/AdmHndlr.c])
AC_CONFIG_AUX_DIR(build)
AC_CONFIG_HEADER([config.h])
-@@ -73,23 +73,8 @@
+
+-# Default install dir
+-AC_PREFIX_DEFAULT(/usr/local)
+-
+ # Include commands that automake needs
+ AM_INIT_AUTOMAKE
+
+@@ -73,32 +70,10 @@ if test "${pcscdropdir}" = false ; then
fi
fi
@@ -38,11 +37,22 @@
- AC_MSG_ERROR([install pcsc-lite 1.2.0 or later])
- fi
-fi
+-
+-# Check for libusb 0.1.12
+-PKG_LIBUSB="libusb"
+-if test "$PKGCONFIG" = "yes"; then
+- if ! `pkg-config --print-errors --atleast-version=0.1.12 $PKG_LIBUSB`
+- then
+- AC_MSG_ERROR([install libusb 0.1.12 or later])
+- fi
+-fi
+PKG_CHECK_MODULES([PCSCLITE], [libpcsclite >= 1.2.0])
++PKG_CHECK_MODULES([LIBUSB], [libusb >= 0.1.12],,
++ AC_MSG_ERROR([install libusb 0.1.12 or later]))
# --enable-usbdropdir=DIR
AC_ARG_ENABLE([usbdropdir],
-@@ -99,20 +84,8 @@
+@@ -108,20 +83,8 @@ AC_ARG_ENABLE([usbdropdir],
[usbdropdir=false])
if test "${usbdropdir}" = false ; then
@@ -64,7 +74,7 @@
AC_SUBST(usbdropdir)
AC_MSG_RESULT([USB drop directory : $usbdropdir])
-@@ -134,38 +107,11 @@
+@@ -143,42 +106,11 @@ AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR,
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -90,6 +100,7 @@
-# Setup the compiler and linker flag
-OLD_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_PCSCLITE`"
+-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_LIBUSB`"
-
-# Check for pcsclite header files
-# removed by ZETES NO_PCSC_MSG="Please install PCSCLITE 1.2.0 or later before building the driver!!"
@@ -100,10 +111,13 @@
-AC_SUBST(LIBPCSCLITE)
-LIBPCSCLITE=`pkg-config --libs $PKG_PCSCLITE`
-
+-AC_SUBST(LIBUSB)
+-LIBUSB=`pkg-config --libs $PKG_LIBUSB`
+-
# Select OS specific versions of source files.
AC_SUBST(BUNDLE_HOST)
AC_SUBST(DYN_LIB_EXT)
-@@ -205,6 +151,7 @@
+@@ -218,6 +150,7 @@ AC_CHECK_FUNCS([select strerror strncpy
AC_CONFIG_FILES([Makefile
src/driver/Makefile
src/controllib/Makefile
@@ -112,6 +126,14 @@
+ src/driver/Info.plist])
AC_OUTPUT
+--- Makefile.am
++++ Makefile.am
+@@ -6,3 +6,5 @@
+
+ # -- Top-level Makefile.am --
+ SUBDIRS = src/controllib src/driver
++
++DISTCHECK_CONFIGURE_FLAGS = --enable-usbdropdir=$$dc_install_base/pcsc/drivers
--- src/controllib/Makefile.am
+++ src/controllib/Makefile.am
@@ -4,9 +4,7 @@
@@ -125,11 +147,12 @@
lib_LTLIBRARIES = libacr38ucontrol.la
include_HEADERS = ACS38DrvTools.h
-@@ -16,8 +14,6 @@
+@@ -16,8 +14,7 @@ SRC_CONTROLLIB = ACS38DrvTools.c \
ACS38DrvTools.h
libacr38ucontrol_la_SOURCES = $(SRC_CONTROLLIB)
-libacr38ucontrol_la_CFLAGS = `pkg-config libpcsclite --cflags`
++libacr38ucontrol_la_CFLAGS = $(PCSCLITE_LIBS)
-#pcdir= $(PKG_PCSC_CONFIG_PATH)
-pcdir= @prefix@/lib/pkgconfig
@@ -161,7 +184,7 @@
+driverdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)
-EXTRA_DIST = Info.plist
-+AM_CPPFLAGS = $(PCSCLITE_CFLAGS)
++AM_CPPFLAGS = $(PCSCLITE_CFLAGS) $(LIBUSB_CFLAGS)
-lib_LTLIBRARIES = libACR38UDriver.la
+plistdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents
@@ -171,7 +194,7 @@
SRC_DRV = ACR38IOCtrl.h \
AdmHndlr.c \
-@@ -21,6 +22,7 @@
+@@ -21,6 +22,7 @@ SRC_DRV = ACR38IOCtrl.h \
ctapi.h \
MCU_ATR.c \
SysConfig.c \
@@ -179,12 +202,12 @@
usbserial_linux.c \
usbserial_linux.h \
AdmHndlr.h \
-@@ -37,14 +39,6 @@
+@@ -37,14 +39,6 @@ SRC_DRV = ACR38IOCtrl.h \
SRC_USB = usblinux.c \
usblinux.h
-libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
--libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @COREFOUNDATION@ @IOKIT@
+-libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @LIBUSB@ @COREFOUNDATION@ @IOKIT@
-
-install: libACR38UDriver.la
- $(mkinstalldirs) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/
@@ -195,5 +218,5 @@
-uninstall:
- rm -rf $(usbdropdir)/$(DRIVER_BUNDLE_DIR)
+ACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
-+ACR38UDriver_la_LIBADD = $(PCSCLITE_LIBS) $(COREFOUNDATION) $(IOKIT)
++ACR38UDriver_la_LIBADD = $(PCSCLITE_LIBS) $(LIBUSB_LIBS) $(COREFOUNDATION) $(IOKIT)
+ACR38UDriver_la_LDFLAGS = -module -avoid-version
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
