Hello community, here is the log from the commit of package pcsc-cyberjack checked in at Thu Dec 6 01:19:39 CET 2007. -------- --- pcsc-cyberjack/pcsc-cyberjack.changes 2007-07-31 16:47:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcsc-cyberjack/pcsc-cyberjack.changes 2007-12-04 19:24:47.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Dec 4 19:08:50 CET 2007 - sbrabec@suse.cz + +- Updated to version 3.0.5: + * fixes a bug which makes Moneyplex unable to read cards with new + ecoms + * enables reading of German medical cards with 0x400 devices + * introduces a workaround for hanging USB hardware + * fixes a bug in the USB logging code + * fixes bug which can cause the driver to crash +- Fixed hal rules for OpenSUSE >= 10.3 (#336704). +- Added symlinks to work-around incorrect dynamic linking + (#336707). + +------------------------------------------------------------------- Old: ---- ctapi-cyberjack-3.0.3.tar.bz2 New: ---- ctapi-cyberjack-3.0.5.tar.bz2 pcsc-cyberjack-libpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-cyberjack.spec ++++++ --- /var/tmp/diff_new_pack.T17886/_old 2007-12-06 01:18:54.000000000 +0100 +++ /var/tmp/diff_new_pack.T17886/_new 2007-12-06 01:18:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package pcsc-cyberjack (Version 3.0.3) +# spec file for package pcsc-cyberjack (Version 3.0.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,23 +11,28 @@ # norootforbuild Name: pcsc-cyberjack -BuildRequires: gcc-c++ hal openSUSE-release pcsc-lite-devel pkg-config readline-devel +BuildRequires: gcc-c++ hal openSUSE-release pcsc-lite-devel readline-devel %if %suse_version > 1020 -BuildRequires: libusb-devel licenses +BuildRequires: libusb-devel licenses pkg-config Requires: licenses %endif -Version: 3.0.3 -Release: 7 +Version: 3.0.5 +Release: 1 Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries -License: LGPL v2 or later -URL: http://www.reiner-sct.de/support/treiber_cyberjack.php +License: LGPL v2.1 or later +Url: http://www.reiner-sct.de/support/treiber_cyberjack.php Summary: PC/SC IFD Handler for the Reiner SCT Cyberjack USB-SmartCard Reader # http://sourceforge.net/project/showfiles.php?group_id=34542&package_id=201305 -Source0: ctapi-cyberjack-%{version}.tar.bz2 +Source: ctapi-cyberjack-%{version}.tar.bz2 Patch1: configure.patch +Patch2: pcsc-cyberjack-libpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %suse_version > 1020 %define ifddir %(pkg-config --variable=usbdropdir libpcsclite) +%else +%define ifddir %{_libdir}/readers +%endif %description This package includes the PC/SC IFD handler for the Reiner SCT @@ -75,22 +80,33 @@ %setup -q -n ctapi-cyberjack-%{version} # configure.patch (this together with --enable-udev=no enables hal) %patch1 +%patch2 +%if %suse_version >= 1030 +sed -i 's/key="info.bus" string="usb_device"/key="info.category" string="usbraw"/;s/@info.parent://;' etc/hal/80-cyberjack.fdi +%endif %build +ACLOCAL="aclocal -I m4" autoreconf -f -i %configure\ --enable-release\ --libdir=%{ifddir}\ - --enable-udev=no + --disable-udev make %{?jobs:-j%jobs} %install %makeinstall +install -d $RPM_BUILD_ROOT/etc/hal/fdi/policy/10osvendor +install -m 644 etc/hal/*.fdi $RPM_BUILD_ROOT/etc/hal/fdi/policy/10osvendor/ +# symlinks (workaround for #336707) +# FIXME: Code should use compile time linking or fix paths. +for lib in $RPM_BUILD_ROOT%{ifddir}/*so* ; do + ln -s readers/$(basename $lib) $RPM_BUILD_ROOT%{_libdir}/$(basename $lib) +done # clean up rm $RPM_BUILD_ROOT/%{ifddir}/libctapi-cyberjack.la rm $RPM_BUILD_ROOT/%{ifddir}/pcsc/drivers/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.la rm $RPM_BUILD_ROOT/%{ifddir}/cyberjack/getdist.sh mv $RPM_BUILD_ROOT/%{ifddir}/pcsc/drivers/ifd-cyberjack.bundle $RPM_BUILD_ROOT/%{ifddir} -mkdir -p $RPM_BUILD_ROOT/etc/hal/fdi/policy/10osvendor mv $RPM_BUILD_ROOT/%{_sysconfdir}/cyberjack.conf{.default,} %if %suse_version > 1020 for FILE in COPYING COPYRIGHT.GPL COPYRIGHT.LGPL ; do @@ -100,6 +116,8 @@ fi done %endif +# --disable-udev does not work as it should: +rm $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*.rules $RPM_BUILD_ROOT/sbin/* %clean rm -rf $RPM_BUILD_ROOT @@ -113,11 +131,25 @@ %defattr(-,root,root) %doc ChangeLog COPYING COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.* doc/LIESMICH.* doc/*.c %{_bindir}/* -%{_sysconfdir}/hal/fdi/policy/10osvendor +%{_libdir}/*.so* +%{_sysconfdir}/hal/fdi/policy/10osvendor/*.fdi %config(noreplace) %{_sysconfdir}/cyberjack.conf %{ifddir}/*.so* +# FIXME: This should be part of hal or we should check 90osvendor: +%dir %{_sysconfdir}/hal/fdi/policy/10osvendor %changelog +* Tue Dec 04 2007 - sbrabec@suse.cz +- Updated to version 3.0.5: + * fixes a bug which makes Moneyplex unable to read cards with new + ecoms + * enables reading of German medical cards with 0x400 devices + * introduces a workaround for hanging USB hardware + * fixes a bug in the USB logging code + * fixes bug which can cause the driver to crash +- Fixed hal rules for OpenSUSE >= 10.3 (#336704). +- Added symlinks to work-around incorrect dynamic linking + (#336707). * Tue Jul 31 2007 - sbrabec@suse.cz - Detect SuSE distribution correctly. * Thu Jul 26 2007 - sbrabec@suse.cz ++++++ ctapi-cyberjack-3.0.3.tar.bz2 -> ctapi-cyberjack-3.0.5.tar.bz2 ++++++ ++++ 29836 lines of diff (skipped) ++++++ pcsc-cyberjack-libpath.patch ++++++ --- tools/cjgeldkarte/Makefile.am +++ tools/cjgeldkarte/Makefile.am @@ -2,7 +2,7 @@ DEFS+=@cyberjack_platform_def@ -DEFS+=-DLIBRARY_NAME=\"libctapi-cyberjack.so.@CYBERJACK_SO_EFFECTIVE@\" +DEFS+=-DLIBRARY_NAME=\"$(libdir)/readers/libctapi-cyberjack.so.@CYBERJACK_SO_EFFECTIVE@\" bin_PROGRAMS=cjgeldkarte ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org