Hello community, here is the log from the commit of package pcsc-cyberjack for openSUSE:Factory checked in at Thu May 19 09:42:08 CEST 2011.
-------- --- pcsc-cyberjack/pcsc-cyberjack.changes 2011-04-05 14:23:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcsc-cyberjack/pcsc-cyberjack.changes 2011-05-17 11:15:36.000000000 +0200 @@ -1,0 +2,15 @@ +Tue May 17 09:13:44 UTC 2011 - [email protected] + +- Updated to version 3.99.5final released by Reiner-SCT + (during 3.99.x phase there were two different code lines and + therefore the version numbers do not match; this version is the + official released version from the vendor) + +------------------------------------------------------------------- +Sun May 15 11:46:49 UTC 2011 - [email protected] + +- Updated to version 3.99.10beta + * ctapi interface removed -> removed ctapi-cyberjack subpackage +- dropped spec file support for 10.1 and older + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- baselibs.conf ctapi-cyberjack-3.3.6.tar.bz2 New: ---- pcsc-cyberjack-3.99.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-cyberjack.spec ++++++ --- /var/tmp/diff_new_pack.pvvchB/_old 2011-05-19 09:39:58.000000000 +0200 +++ /var/tmp/diff_new_pack.pvvchB/_new 2011-05-19 09:39:58.000000000 +0200 @@ -19,43 +19,36 @@ Name: pcsc-cyberjack -%define _name ctapi-cyberjack -BuildRequires: distribution-release gcc-c++ hal-devel pcsc-lite-devel pkg-config readline-devel +BuildRequires: distribution-release gcc-c++ pcsc-lite-devel pkg-config readline-devel %if %suse_version >= 1120 -BuildRequires: libusb-1_0-devel -%endif -%if %suse_version > 1020 -BuildRequires: libusb-devel +BuildRequires: libusb-1_0-devel udev +%else +BuildRequires: hal-devel libusb-devel %endif -Version: 3.3.6 +Version: 3.99.5 Release: 1 Group: Productivity/Security License: LGPLv2.1+ Url: http://www.reiner-sct.de/support/treiber_cyberjack.php -Summary: PC/SC IFD Handler for the Reiner SCT Cyberjack USB-SmartCard Reader -Source: %{_name}-%{version}.tar.bz2 +Summary: PC/SC IFD Handler for the Reiner SCT Cyberjack USB-SmartCard Readers +Source: %{name}-%{version}.tar.bz2 Source1: %{name}-README.SUSE Source2: 40-cyberjack.rules -Source3: baselibs.conf Patch1: ctapi-cyberjack-configure.patch -Patch6: ctapi-cyberjack-check.patch +Patch2: ctapi-cyberjack-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: pcsc-lite -%if %suse_version > 1020 %define ifddir %(pkg-config --variable=usbdropdir libpcsclite) -%else -%define ifddir %{_libdir}/readers -%endif %define LBRACE ( %define RBRACE ) %define QUOTE " %define BACKSLASH \\ %define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | sed -n 's/^ACTION=="ADD", SUBSYSTEM=="USB", ENV{PRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^{QUOTE}%{BACKSLASH}/]*%{BACKSLASH}%{RBRACE}%{BACKSLASH}/%{BACKSLASH}%{LBRACE}[^{QUOTE}]*%{BACKSLASH}%{RBRACE}%{BACKSLASH}/%{BACKSLASH}*%{QUOTE}.*$/modalias%{LBRACE}usb:v0%{BACKSLASH}1p0%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') Supplements: %USBDRIVERS +Requires: pcsc-lite %description This package includes the PC/SC IFD handler for the Reiner SCT -Cyberjack pinpad/e-com USB chipcard reader. +Cyberjack pinpad/e-com/RFID USB chipcard readers. This driver is meant to be used with the PCSC-Lite daemon from the pcsc-lite package. @@ -65,61 +58,20 @@ http://www.reiner-sct.de/db/reiner-sct.de/html/e-com.html http://www.reiner-sct.de/db/reiner-sct.de/html/pinpad.html -%package -n ctapi-cyberjack -License: LGPLv2.1+ -Group: System/Libraries -Summary: CT-API and tools for Reiner SCT Cyberjack USB-SmartCard Reader -# Modules: cyberjack.ko -Supplements: %USBDRIVERS -Supplements: modalias(usb:v0C4Bp0100d*dc*dsc*dp*ic*isc*ip*) -# Generated with: extract-modaliases -i cyberjack kernel-default.rpm - -%description -n ctapi-cyberjack -REINER SCT Cyberjack pinpad/e-com USB user space driver. This package -includes the CT-API driver for the Cyberjack pinpad/e-com USB chipcard -reader and some tools as a simple CT shell around it. - -For more information about the reader, software updates, and more see: - -http://www.reiner-sct.de/db/reiner-sct.de/html/e-com.html -http://www.reiner-sct.de/db/reiner-sct.de/html/pinpad.html - %prep -%setup -q -n %{_name}-%{version} +%setup -q -n %{name}-%{version}final cp -a %{S:1} README.SUSE %patch1 -%patch6 -p1 -# No patching needed for openSUSE >= 11.2 and above: Use udev. -%if %suse_version < 1120 -%if %suse_version >= 1110 -# openSUSE >= 11.1: No resmgr, use HAL capabilities, which does it for us using HAL ACL, USB us "subsystem". -# NOTE: openSUSE 11.1 does not support smart_card_reader HAL ACL category yet. -sed -i 's/key="info.category" string="usbraw"/key="info.subsystem" string="usb"/;s/@info.parent:usb_device/usb/; - s:^\([[:space:]]*\)<merge key="resmgr.class" type="string">usb</merge>:\1<merge key="info.category" type="string">smart_card_reader</merge>\ -\1<append key="info.capabilities" type="strlist">smart_card_reader</append>:' etc/hal/80-cyberjack.fdi -sed -i 's:haldir=/etc/hal/fdi/policy/10osvendor:haldir=/usr/share/hal/fdi/information/20thirdparty:' etc/hal/Makefile.am -%else -%if %suse_version > 1030 -# openSUSE > 10.3: USB is "subsystem", not "bus" -sed -i 's/key="info.category" string="usbraw"/key="info.subsystem" string="usb_device"/;s/@info.parent://;' etc/hal/80-cyberjack.fdi -%else -%if %suse_version == 1030 -# openSUSE == 10.3: USB is "bus", not abusing "category" any more -sed -i 's/key="info.category" string="usbraw"/key="info.bus" string="usb_device"/;s/@info.parent://;' etc/hal/80-cyberjack.fdi -%endif -%endif -%endif -%endif +%patch2 %build -%if %suse_version >1030 ACLOCAL="aclocal -I m4" autoreconf -f -i -%endif %configure\ --disable-static\ --enable-release\ %if %suse_version < 1120 - --enable-udev=no\ + --enable-hal=yes \ + --enable-udev=no \ %endif --with-usbdropdir=%{ifddir} make %{?jobs:-j%jobs} @@ -129,56 +81,30 @@ %if %suse_version >= 1120 mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/ install %{SOURCE2} $RPM_BUILD_ROOT/lib/udev/rules.d/ -rm $RPM_BUILD_ROOT%{_sysconfdir}/hal/fdi/policy/10osvendor/80-cyberjack.fdi -rmdir $RPM_BUILD_ROOT%{_sysconfdir}/hal/fdi/policy/10osvendor -rmdir $RPM_BUILD_ROOT%{_sysconfdir}/hal/fdi/policy -rmdir $RPM_BUILD_ROOT%{_sysconfdir}/hal/fdi -rmdir $RPM_BUILD_ROOT%{_sysconfdir}/hal %endif -# symlinks (workaround for #336707) -for lib in $RPM_BUILD_ROOT%{_libdir}/libctapi-cyberjack*so* ; do - ln -s %{_libdir}/$(basename $lib) $RPM_BUILD_ROOT%{ifddir}/$(basename $lib) -done # clean up -rm $RPM_BUILD_ROOT%{_libdir}/libctapi-cyberjack.la mv $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf{.default,} # man pages mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man8/ mv $RPM_BUILD_ROOT%{_datadir}/man/*.8 $RPM_BUILD_ROOT%{_datadir}/man/man8/ - -%post -n ctapi-cyberjack -p /sbin/ldconfig - -%postun -n ctapi-cyberjack -p /sbin/ldconfig +# exclude +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/hal/fdi/policy/10osvendor/80-cyberjack.fdi +rm -rf $RPM_BUILD_ROOT%{_libdir}/cyberjack/pcscd_init.diff %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.* README.SUSE doc/LIESMICH.* ChangeLog NEWS %dir %{ifddir} %{ifddir}/libifd-cyberjack.bundle - -%files -n ctapi-cyberjack -%defattr(-,root,root) -%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.* README.SUSE doc/LIESMICH.* ChangeLog NEWS %doc %{_mandir}/man8/* -%dir %{ifddir} -%{ifddir}/*.so* -%{_libdir}/*.so* -%{_libdir}/cyberjack %{_bindir}/* +%{_libdir}/cyberjack +%config(noreplace) %{_sysconfdir}/cyberjack.conf %if %suse_version >= 1120 /lib/udev/rules.d/* -%else -%if %suse_version < 1120 -%if %suse_version > 1100 -%{_datadir}/hal/fdi/information/20thirdparty/*.fdi -%else -%{_sysconfdir}/hal/fdi/policy/10osvendor/*.fdi -%dir %{_sysconfdir}/hal/fdi/policy/10osvendor -%endif %endif -%endif -%config(noreplace) %{_sysconfdir}/cyberjack.conf %changelog ++++++ 40-cyberjack.rules ++++++ --- /var/tmp/diff_new_pack.pvvchB/_old 2011-05-19 09:39:59.000000000 +0200 +++ /var/tmp/diff_new_pack.pvvchB/_new 2011-05-19 09:39:59.000000000 +0200 @@ -9,5 +9,6 @@ ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0400", ENV{ID_SMARTCARD_READER}="1" ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0401", ENV{ID_SMARTCARD_READER}="1" ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", ENV{ID_SMARTCARD_READER}="1" +ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0501", ENV{ID_SMARTCARD_READER}="1" LABEL="cyberjack_rules_end" ++++++ ctapi-cyberjack-check.patch ++++++ --- /var/tmp/diff_new_pack.pvvchB/_old 2011-05-19 09:39:59.000000000 +0200 +++ /var/tmp/diff_new_pack.pvvchB/_new 2011-05-19 09:39:59.000000000 +0200 @@ -1,6 +1,6 @@ ---- ctapi-cyberjack-3.3.2/checksuite/cm_group.cpp -+++ ctapi-cyberjack-3.3.2/checksuite/cm_group.cpp -@@ -52,7 +52,12 @@ +--- libcyberjack/checksuite/cm_group.cpp.orig 2011-04-26 16:33:52.783501829 +0200 ++++ libcyberjack/checksuite/cm_group.cpp 2011-04-26 16:38:14.133345820 +0200 +@@ -52,7 +52,12 @@ bool CM_Group::check(std::string &xmlStr "Problemen schnell zu helfen.\n" "Sollten fuer Ihr System keine Pakete verfuegbar sein, muessen " "Sie die Gruppe \"cyberjack\" mit Hilfe Ihrer Systemadministrations-" @@ -14,15 +14,3 @@ xmlString+="<check type=\"group\">\n"; xmlString+=" <result type=\"error\">"; xmlString+="Gruppe cyberjack existiert nicht"; ---- ctapi-cyberjack-3.3.2/checksuite/cm_services.cpp -+++ ctapi-cyberjack-3.3.2/checksuite/cm_services.cpp -@@ -109,8 +109,7 @@ - "Abhilfe: Entweder deinstallieren Sie den PC/SC Dienst " - "komplett (das Paket heisst je nach System \"pcscd\"" - "oder \"pcsc-lite\"), oder sie deinstallieren einfach " -- "das Cyberjack-Paket mit dem IFD-Treiber (Paket mit " -- "\"-ifd\" am Ende).\n" -+ "das Cyberjack-Paket mit dem IFD-Treiber (pcsc-cyberjack).\n" - "Sie koennen allerdings auch den Dienst mittels " - "\"killall pcscd\" (als root) beenden.\n\n"; - _suite->addFlags(CHECKSUITE_FLAGS_HAVE_PCSCD); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
