Hello community,
here is the log from the commit of package pcsc-cyberjack for openSUSE:Factory
checked in at Fri Mar 5 11:53:21 CET 2010.
--------
--- pcsc-cyberjack/pcsc-cyberjack.changes 2009-08-05 17:47:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/pcsc-cyberjack/pcsc-cyberjack.changes 2010-02-01 13:23:55.000000000 +0100
@@ -1,0 +2,19 @@
+Mon Feb 1 12:23:50 UTC 2010 - jengelh@medozas.de
+
+- Package baselibs.conf
+
+-------------------------------------------------------------------
+Wed Jan 6 15:18:15 CET 2010 - sbrabec@suse.cz
+
+- Use libusb1 in >= 11.2.
+- Added back support for SLES10.
+
+-------------------------------------------------------------------
+Mon Dec 21 21:00:23 CET 2009 - wr@rosenauer.org
+
+- Updated to version 3.3.3
+ * compatible with recent libusb
+- Added udev rules for ACL access (bnc#555660)
+- Removed support for 10.3 and older
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ctapi-cyberjack-3.3.2.tar.bz2
ctapi-cyberjack-gcc44.patch
New:
----
40-cyberjack.rules
ctapi-cyberjack-3.3.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-cyberjack.spec ++++++
--- /var/tmp/diff_new_pack.fQOP21/_old 2010-03-05 11:52:52.000000000 +0100
+++ /var/tmp/diff_new_pack.fQOP21/_new 2010-03-05 11:52:52.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package pcsc-cyberjack (Version 3.3.2)
+# spec file for package pcsc-cyberjack (Version 3.3.3)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,29 +20,30 @@
Name: pcsc-cyberjack
%define _name ctapi-cyberjack
-BuildRequires: gcc-c++ hal-devel pcsc-lite-devel pkg-config readline-devel
+BuildRequires: distribution-release gcc-c++ hal-devel pcsc-lite-devel pkg-config readline-devel
+%if %suse_version >= 1120
+BuildRequires: libusb-1_0-devel
+%endif
%if %suse_version > 1020
BuildRequires: libusb-devel licenses sysfsutils
%endif
-%if %suse_version > 1100
-BuildRequires: dummy-release
-%else
-BuildRequires: openSUSE-release
-%endif
-Version: 3.3.2
+Version: 3.3.3
Release: 1
Group: Productivity/Security
-License: LGPL v2.1 or later
+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
Source1: %{name}-README.SUSE
+Source2: 40-cyberjack.rules
+Source3: baselibs.conf
Patch1: ctapi-cyberjack-configure.patch
-Patch4: ctapi-cyberjack-gcc44.patch
Patch6: ctapi-cyberjack-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: pcsc-lite
+%if %suse_version > 1020
Requires: licenses
+%endif
%if %suse_version > 1020
%define ifddir %(pkg-config --variable=usbdropdir libpcsclite)
%else
@@ -67,24 +68,17 @@
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
-
-
-Authors:
---------
- Matthias Bruestle
-
%package -n ctapi-cyberjack
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Group: System/Libraries
Summary: CT-API and tools for Reiner SCT Cyberjack USB-SmartCard Reader
+%if %suse_version > 1020
Requires: licenses
+%endif
# Modules: cyberjack.ko
Supplements: %USBDRIVERS
Supplements: modalias(usb:v0C4Bp0100d*dc*dsc*dp*ic*isc*ip*)
# Generated with: extract-modaliases -i cyberjack kernel-default.rpm
-%if %suse_version > 1020
-Requires: licenses
-%endif
%description -n ctapi-cyberjack
REINER SCT Cyberjack pinpad/e-com USB user space driver. This package
@@ -96,18 +90,13 @@
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
-
-
-Authors:
---------
- Matthias Bruestle
-
%prep
%setup -q -n %{_name}-%{version}
cp -a %{S:1} README.SUSE
%patch1
-%patch4
%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.
@@ -126,18 +115,32 @@
%endif
%endif
%endif
+%endif
%build
+%if %suse_version >1030
ACLOCAL="aclocal -I m4" autoreconf -f -i
+%endif
%configure\
--disable-static\
--enable-release\
- --with-usbdropdir=%{ifddir}\
- --enable-udev=no
+%if %suse_version < 1120
+ --enable-udev=no\
+%endif
+ --with-usbdropdir=%{ifddir}
make %{?jobs:-j%jobs}
%install
%makeinstall
+%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)
@@ -147,8 +150,8 @@
rm $RPM_BUILD_ROOT%{_libdir}/libctapi-cyberjack.la
rm $RPM_BUILD_ROOT%{ifddir}/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.la
mv $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf{.default,}
-# licenses
%if %suse_version > 1020
+# licenses
for FILE in COPYING COPYRIGHT.GPL COPYRIGHT.LGPL ; do
MD5SUM=$(md5sum $FILE | sed 's/ .*//')
if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then
@@ -177,12 +180,18 @@
%{_libdir}/*.so*
%{_libdir}/cyberjack
%{_bindir}/*
+%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 ++++++
SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
ACTION!="add", GOTO=cyberjack_rules_end"
ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0100", ENV{ID_SMARTCARD_READER}="1"
ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0300", ENV{ID_SMARTCARD_READER}="1"
ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0400", ENV{ID_SMARTCARD_READER}="1"
ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0401", ENV{ID_SMARTCARD_READER}="1"
LABEL="cyberjack_rules_end"
++++++ ctapi-cyberjack-3.3.2.tar.bz2 -> ctapi-cyberjack-3.3.3.tar.bz2 ++++++
++++ 29258 lines of diff (skipped)
++++++ ctapi-cyberjack-configure.patch ++++++
--- /var/tmp/diff_new_pack.fQOP21/_old 2010-03-05 11:52:53.000000000 +0100
+++ /var/tmp/diff_new_pack.fQOP21/_new 2010-03-05 11:52:53.000000000 +0100
@@ -1,6 +1,26 @@
--- configure.ac
+++ configure.ac
-@@ -482,16 +482,7 @@
+@@ -537,16 +537,7 @@
+ fi
+ if test -n "${RPM_DIST_TAG}"; then
+ case "${RPM_DIST_TAG}${RPM_DIST_VER}" in
+- suse9.*)
+- ETC_SUBDIRS="resmgr"
+- RPM_PCSC_DROPDIR="%{_libdir}/readers"
+- ;;
+- suse10.0)
+- ETC_SUBDIRS="udev"
+- USE_UDEV=1
+- RPM_PCSC_DROPDIR="%{_libdir}/readers"
+- ;;
+- suse10.1)
++ suse*)
+ ETC_SUBDIRS="hal"
+ RPM_PCSC_DROPDIR="%{_libdir}/readers"
+ ;;
+--- configure
++++ configure
+@@ -18009,16 +18009,7 @@
fi
if test -n "${RPM_DIST_TAG}"; then
case "${RPM_DIST_TAG}${RPM_DIST_VER}" in
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org