commit pcsc-acr38

25 May 2007

Hello community,

here is the log from the commit of package pcsc-acr38
checked in at Fri May 25 17:25:14 CEST 2007.

--------

--- pcsc-acr38/pcsc-acr38.changes	2006-11-27 12:00:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/pcsc-acr38/pcsc-acr38.changes	2007-05-25 11:53:29.000000000 +0200
@@ -1,0 +2,12 @@
+Fri May 25 11:53:16 CEST 2007 - sbrabec@suse.cz
+
+- Updated to version 1.7.9:
+  * Fixed an error in the target location of libacr38ucontrol.pc
+  * Mac only release that includes Universal Binary
+  * Issue PPS in a loop to handle the case when PTS1=0x95 for
+    older ACR38
+- Fixes unplug-replug without restarting pcscd (#259973).
+- Added devel subpackage.
+- Use classic versioning schema (used in upstream ChangeLog).
+
+-------------------------------------------------------------------

Old:
----
  ACR38_LINUX_100705_P-destdir.diff
  ACR38_LINUX_100705_P.tar.bz2

New:
----
  ACR38_LINUX_100709-automake-cleanup.patch
  ACR38_LINUX_100709_P.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pcsc-acr38.spec ++++++
--- /var/tmp/diff_new_pack.Kb4938/_old	2007-05-25 17:25:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Kb4938/_new	2007-05-25 17:25:06.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package pcsc-acr38 (Version 100705_P)
+# spec file for package pcsc-acr38 (Version 1.7.9)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,20 +11,21 @@
 # norootforbuild
 
 Name:           pcsc-acr38
-BuildRequires:  pcsc-lite-devel pkgconfig
-Version:        100705_P
-Release:        36
+BuildRequires:  pcsc-lite-devel pkg-config
+Version:        1.7.9
+Release:        1
+%define _version 100709_P
 Provides:       locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE)
 Group:          System/Libraries
-License:        GNU General Public License (GPL), Other License(s), see package
+License:        GNU General Public License (GPL)
 URL:            http://www.linuxnet.com/
 Summary:        PC/SC IFD Handler for the ACR38 Smart Card Reader
-Source0:        ACR38_LINUX_%{version}.tar.bz2
-Patch0:         ACR38_LINUX_%{version}-destdir.diff
-Patch1:         ACR38_LINUX_%{version}-ucread.diff
-Patch2:         ACR38_LINUX_%{version}-usb.diff
+Source0:        ACR38_LINUX_%{_version}.tar.bz2
+Patch1:         ACR38_LINUX_100705_P-ucread.diff
+Patch2:         ACR38_LINUX_100705_P-usb.diff
+Patch3:         ACR38_LINUX_100709-automake-cleanup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define ifddir %{_libdir}/readers
+%define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
 
 %description
 This package contains a driver for the ACR 38 smart card reader
@@ -38,38 +39,71 @@
     David Corcoran <corcoran@linuxnet.com>
     Edward Cheung <edward.cheung@acs.com.hk>
 
+%package devel
+Group:          System/Libraries
+Summary:        PC/SC IFD Handler for the ACR38 Smart Card Reader
+Requires:       %{name} = %{version} pcsc-lite-devel
+
+%description devel
+This package contains a driver for the ACR 38 smart card reader
+produced by ACS. This driver is meant to be used with the PCSC-Lite
+daemon from the pcsc-lite package.
+
+
+
+Authors:
+--------
+    David Corcoran <corcoran@linuxnet.com>
+    Edward Cheung <edward.cheung@acs.com.hk>
+
 %prep
-%setup -q -n ACR38_LINUX_%{version}
-%patch0
+%setup -q -n ACR38_LINUX_%{_version}
 %patch1
 %patch2
+%patch3
 
 %build
-%{suse_update_config -f build}
-aclocal --force
-libtoolize --force
-autoconf --force
-autoheader --force
-automake -afc
-CFLAGS="$RPM_OPT_FLAGS" \
-	./configure \
-	--libdir=%{ifddir} \
-	--enable-usbdropdir=%{ifddir}
-make
+autoreconf -f -i
+%configure\
+	--disable-static
+make %{?jobs:-j%jobs}
 
 %install
-install -d $RPM_BUILD_ROOT%{ifddir}
-make -C src/driver install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
+rm $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{ifddir}/*/*/*/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%run_ldconfig
+
+%postun
+%run_ldconfig
+
 %files
-%defattr(644,root,root,755)
+%defattr(-,root,root)
+# NEWS is empty
 %doc AUTHORS COPYING ChangeLog README
-%{ifddir}
+%{_libdir}/*.so.*
+%{ifddir}/*
 
-%changelog -n pcsc-acr38
+%files devel
+%defattr(-,root,root)
+%{_includedir}/*.h
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+
+%changelog
+* Fri May 25 2007 - sbrabec@suse.cz
+- Updated to version 1.7.9:
+  * Fixed an error in the target location of libacr38ucontrol.pc
+  * Mac only release that includes Universal Binary
+  * Issue PPS in a loop to handle the case when PTS1=0x95 for
+  older ACR38
+- Fixes unplug-replug without restarting pcscd (#259973).
+- Added devel subpackage.
+- Use classic versioning schema (used in upstream ChangeLog).
 * Mon Nov 27 2006 - mjancar@suse.cz
 - use /dev/bus/usb instead of /proc/bus/usb (#223740)
 * Tue Nov 07 2006 - prusnak@suse.cz

++++++ ACR38_LINUX_100705_P-ucread.diff ++++++
--- /var/tmp/diff_new_pack.Kb4938/_old	2007-05-25 17:25:07.000000000 +0200
+++ /var/tmp/diff_new_pack.Kb4938/_new	2007-05-25 17:25:07.000000000 +0200
@@ -1,3 +1,6 @@
+https://bugzilla.novell.com/show_bug.cgi?id=186108
+AdmHndlr.c(493): warning #175: subscript out of range
+AdmHndlr.c(494): warning #175: subscript out of range
 --- src/driver/AdmHndlr.c
 +++ src/driver/AdmHndlr.c
 @@ -478,7 +478,7 @@

++++++ ACR38_LINUX_100709-automake-cleanup.patch ++++++
--- configure.ac
+++ configure.ac
@@ -2,7 +2,7 @@
 # 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_CONFIG_SRCDIR([src/driver/AdmHndlr.c])
 AC_CONFIG_AUX_DIR(build)
 AC_CONFIG_HEADER([config.h])
@@ -73,23 +73,8 @@
 	fi
 fi
 
-# removed by ZETES
-# AC_SUBST([PKG_PCSC_CONFIG_PATH],[$pcscdropdir/lib/pkgconfig])
-# removed by ZETES
-# AC_SUBST([PKG_PCSCLITE],[$pcscdropdir/lib/pkgconfig/libpcsclite.pc])
-
-# added by ZETES ...
-PKG_PCSCLITE="libpcsclite"
-# ... added by ZETES
-
 # Check if pkg-config exists
-AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes])
-if test "$PKGCONFIG" = "yes"; then
-	if ! `pkg-config --print-errors --atleast-version=1.2.0 $PKG_PCSCLITE`
-	then
-		AC_MSG_ERROR([install pcsc-lite 1.2.0 or later])
-	fi
-fi
+PKG_CHECK_MODULES([PCSCLITE], [libpcsclite >= 1.2.0])
 
 # --enable-usbdropdir=DIR
 AC_ARG_ENABLE([usbdropdir],
@@ -99,20 +84,8 @@
 			[usbdropdir=false])
 
 if test "${usbdropdir}" = false ; then
-	if test "$PKGCONFIG" = yes ; then
-		usbdropdir=`pkg-config $PKG_PCSCLITE --variable=usbdropdir`
-	else
-		usbdropdir=""
-	fi
-	if test -z "$usbdropdir" ; then
-		if test "$prefix" = NONE ; then
-			usbdropdir="$ac_default_prefix/pcsc/drivers"
-		else
-			usbdropdir="$prefix/pcsc/drivers"
-		fi
-	fi
+		usbdropdir=`$PKG_CONFIG libpcsclite --variable=usbdropdir`
 fi
-
 AC_SUBST(usbdropdir)
 
 AC_MSG_RESULT([USB drop directory      : $usbdropdir])
@@ -134,38 +107,11 @@
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
-# Checks for libraries.
-# FIXME: Replace `main' with a function in `-lpcsclite':
-#AC_CHECK_LIB([pcsclite], [main])
-# FIXME: Replace `main' with a function in `-lpthread':
-#AC_CHECK_LIB([pthread], [main])
-
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h limits.h malloc.h memory.h stdlib.h string.h sys/ioctl.h syslog.h unistd.h])
 
-# Test if pcsclite-1.2.9betaX is installed
-#if test -d $pcsclite_inc/PCSC; then
-#	echo "PCSCLITE-1.2.9 or above is installed"
-#	pcsclite_inc="$pcsclite_inc/PCSC"
-#else
-#	echo "PCSCLITE-1.2.0 is installed"
-#fi
-
-# Setup the compiler and linker flag
-OLD_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_PCSCLITE`"
-
-# Check for pcsclite header files
-# removed by ZETES NO_PCSC_MSG="Please install PCSCLITE 1.2.0 or later before building the driver!!"
-# removed by ZETES AC_CHECK_HEADER([pcsclite.h],,[AC_MSG_ERROR([$NO_PCSC_MSG])],[#include <pcsclite.h>])
-
-# removed by ZETES CFLAGS=$OLD_CFLAGS
-
-AC_SUBST(LIBPCSCLITE)
-LIBPCSCLITE=`pkg-config --libs $PKG_PCSCLITE`
-
 # Select OS specific versions of source files.
 AC_SUBST(BUNDLE_HOST)
 AC_SUBST(DYN_LIB_EXT)
--- src/controllib/Makefile.am
+++ src/controllib/Makefile.am
@@ -4,9 +4,7 @@
 #
 # Process this file with automake to produce a Makefile.in script.
 
-ACR38_CONTROLLIB = libacr38ucontrol.$(DYN_LIB_EXT)
-
-AM_CPPFLAGS = -I../driver `pkg-config libpcsclite --cflags` 
+AM_CPPFLAGS = -I $(top_srcdir)/src/driver $(PCSCLITE_CFLAGS)
 
 lib_LTLIBRARIES = libacr38ucontrol.la
 include_HEADERS = ACS38DrvTools.h
@@ -16,8 +14,6 @@
 				 ACS38DrvTools.h
 
 libacr38ucontrol_la_SOURCES = $(SRC_CONTROLLIB)
-libacr38ucontrol_la_CFLAGS = `pkg-config libpcsclite --cflags`
 
-#pcdir= $(PKG_PCSC_CONFIG_PATH)
-pcdir= @prefix@/lib/pkgconfig
-pc_DATA = libacr38ucontrol.pc
+pkgconfigdir= $(libdir)/pkgconfig
+pkgconfig_DATA = libacr38ucontrol.pc
--- src/driver/Makefile.am
+++ src/driver/Makefile.am
@@ -5,15 +5,18 @@
 # Process this file with automake to produce a Makefile.in script.
 
 DRIVER_NAME = ACR38UDriver
-DRIVER_LIB_NAME = lib$(DRIVER_NAME).$(DYN_LIB_EXT)
 DRIVER_BUNDLE_DIR = $(DRIVER_NAME).bundle
-DRIVER_INSTALL_HOME_DIR = pcsc/drivers/$(DRIVER_LIB_NAME).bundle/Contents/Linux
 
-AM_CPPFLAGS = `pkg-config libpcsclite --cflags`
+driverdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)
 
 EXTRA_DIST = Info.plist
 
-lib_LTLIBRARIES = libACR38UDriver.la
+AM_CPPFLAGS = $(PCSCLITE_CFLAGS)
+
+plistdir=$(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents
+plist_DATA=Info.plist
+
+driver_LTLIBRARIES = libACR38UDriver.la
 
 SRC_DRV = ACR38IOCtrl.h		\
 		AdmHndlr.c			\
@@ -21,6 +24,7 @@
 		ctapi.h				\
 		MCU_ATR.c			\
 		SysConfig.c			\
+		SysConfig.h			\
 		usbserial_linux.c	\
 		usbserial_linux.h	\
 		AdmHndlr.h			\
@@ -38,13 +42,4 @@
 		usblinux.h
 
 libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
-libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @COREFOUNDATION@ @IOKIT@
-
-install: libACR38UDriver.la
-	$(mkinstalldirs) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/
-	$(INSTALL) .libs/$(DRIVER_LIB_NAME) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_NAME)
-	$(INSTALL) Info.plist $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents
-#	chmod 755 $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_LIB_NAME)
-
-uninstall:
-	rm -rf $(usbdropdir)/$(DRIVER_BUNDLE_DIR)
+libACR38UDriver_la_LIBADD = $(PCSCLITE_LIBS) $(COREFOUNDATION) $(IOKIT)
++++++ ACR38_LINUX_100705_P.tar.bz2 -> ACR38_LINUX_100709_P.tar.bz2 ++++++
++++ 3308 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)