Hello community, here is the log from the commit of package pcsc-cyberjack checked in at Wed Apr 18 00:40:59 CEST 2007. -------- --- pcsc-cyberjack/pcsc-cyberjack.changes 2006-08-07 11:27:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcsc-cyberjack/pcsc-cyberjack.changes 2007-04-17 13:57:49.628325000 +0200 @@ -1,0 +2,27 @@ +Tue Apr 17 13:49:20 CEST 2007 - sbrabec@suse.cz + +- Updated package from Build Service security:chipcard (#264252). +- Spec file cleanup. + +------------------------------------------------------------------- +Wed Apr 11 00:00:00 CEST 2007 - wr@rosenauer.org + +- update to version 2.0.14 + * ctapi.h is not packaged anymore (someone need it?) + +------------------------------------------------------------------- +Tue Jan 09 00:00:00 CET 2007 - wr@rosenauer.org + +- update to version 2.0.13 + +------------------------------------------------------------------- +Thu Dec 28 00:00:00 CET 2006 - wr@rosenauer.org + +- update to version 2.0.13beta5 + +------------------------------------------------------------------- +Thu Dec 21 00:00:00 CET 2006 - wr@rosenauer.org + +- update to version 2.0.13beta3 + +------------------------------------------------------------------- Old: ---- ctapi-cyberjack-2.0.10.dif ctapi-cyberjack-2.0.10-libso.patch ctapi-cyberjack-2.0.10-make.patch ctapi-cyberjack-2.0.10-return.diff ctapi-cyberjack-2.0.10-rpath.patch ctapi-cyberjack-2.0.10.tar.bz2 ctapi-cyberjack-2.0.10-uninitialized.diff New: ---- ctapi-cyberjack-2.0.14.tar.bz2 ctapi-cyberjack-rpath.patch ctapi-cyberjack-uninitialized.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-cyberjack.spec ++++++ --- /var/tmp/diff_new_pack.wV1494/_old 2007-04-18 00:40:43.000000000 +0200 +++ /var/tmp/diff_new_pack.wV1494/_new 2007-04-18 00:40:43.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package pcsc-cyberjack (Version 2.0.10) +# spec file for package pcsc-cyberjack (Version 2.0.14) # -# 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,24 +11,30 @@ # norootforbuild Name: pcsc-cyberjack -BuildRequires: hal pcsc-lite-devel pkgconfig readline-devel -Version: 2.0.10 -Release: 14 +BuildRequires: readline-devel +%if %suse_version > 1020 +BuildRequires: libusb-devel pkg-config +%else +BuildRequires: libusb pkgconfig +%endif +# For usbdropdir check: +BuildRequires: pcsc-lite-devel +# For directory ownership only: +BuildRequires: hal +Version: 2.0.14 +Release: 1 Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) URL: http://www.reiner-sct.de/support/treiber_cyberjack.php Summary: PC/SC IFD Handler for the Reiner SCT Cyberjack USB-SmartCard Reader -Source0: ctapi-cyberjack-%{version}.tar.bz2 +# http://sourceforge.net/project/showfiles.php?group_id=34542&package_id=201305 +Source: ctapi-cyberjack-%{version}.tar.bz2 Source1: 80-cyberjack.fdi -Patch0: ctapi-cyberjack-%{version}-return.diff -Patch1: ctapi-cyberjack-%{version}-uninitialized.diff -Patch2: ctapi-cyberjack-%{version}-make.patch -Patch3: ctapi-cyberjack-%{version}-rpath.patch -Patch4: ctapi-cyberjack-%{version}-libso.patch -Patch5: ctapi-cyberjack-2.0.10.dif +Patch1: ctapi-cyberjack-uninitialized.diff +Patch2: ctapi-cyberjack-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define ifddir %{_libdir}/readers +%define ifddir %(pkg-config --variable=usbdropdir libpcsclite) %description This package includes the PC/SC IFD handler for the Reiner SCT @@ -75,53 +81,61 @@ %prep %setup -q -n ctapi-cyberjack-%{version} -%patch0 %patch1 %patch2 -%patch3 -%patch4 -%patch5 %build -make all COPTS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" RPATH="-Wl,-rpath -Wl,%{ifddir}" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export RPATH="-Wl,-rpath -Wl,%{ifddir}" +%configure\ + --libdir=%{ifddir}\ + --enable-release +make %{?jobs:-j%jobs} %install -install -d $RPM_BUILD_ROOT%{ifddir} -# cyberjack -cp -r pcsc/ifd-cyberjack.bundle/ $RPM_BUILD_ROOT%{ifddir}/ -rm $RPM_BUILD_ROOT%{ifddir}/ifd-cyberjack.bundle/Contents/PkgInfo -# Now we want cyberjack's CT-API stuff -install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{ifddir}/libctapi-cyberjack.so.%{version} -( cd $RPM_BUILD_ROOT%{ifddir}; ln -s libctapi-cyberjack.so.%{version} libctapi-cyberjack.so ) -( cd $RPM_BUILD_ROOT%{ifddir}; ln -s libctapi-cyberjack.so libctapi.so ) -install -d $RPM_BUILD_ROOT%{_bindir}/ -install -d $RPM_BUILD_ROOT%{_includedir}/ -install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi.h -install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/ -install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ -install -m 755 tools/ctpin $RPM_BUILD_ROOT%{_bindir}/ +%makeinstall +# 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 +mv $RPM_BUILD_ROOT/%{ifddir}/pcsc/drivers/ifd-cyberjack.bundle $RPM_BUILD_ROOT/%{ifddir} mkdir -p $RPM_BUILD_ROOT/etc/hal/fdi/policy/10osvendor install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/hal/fdi/policy/10osvendor +mv $RPM_BUILD_ROOT/%{_sysconfdir}/cyberjack.conf{.default,} +# resmgr does everything here +rm $RPM_BUILD_ROOT/etc/udev/rules.d/99-cyberjack.rules +rm $RPM_BUILD_ROOT/sbin/udev.cyberjack.sh %clean rm -rf $RPM_BUILD_ROOT %files -%defattr(644,root,root,755) -%doc COPYRIGHT.GPL COPYRIGHT.LGPL +%defattr(-,root,root) +%doc COPYRIGHT.GPL COPYRIGHT.LGPL NEWS README TODO %dir %{ifddir} %{ifddir}/ifd-cyberjack.bundle %files -n ctapi-cyberjack -%defattr(-,root,root,755) +%defattr(-,root,root) %doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.* tools/ctshrc.example %dir %{ifddir} %{ifddir}/*so* -%{_includedir}/* %{_bindir}/* -/etc/hal/fdi/policy/10osvendor/ +%{_sysconfdir}/hal/fdi/policy/10osvendor +%config(noreplace) /etc/cyberjack.conf -%changelog -n pcsc-cyberjack +%changelog +* Tue Apr 17 2007 - sbrabec@suse.cz +- Updated package from Build Service security:chipcard (#264252). +- Spec file cleanup. +* Wed Apr 11 2007 - wr@rosenauer.org +- update to version 2.0.14 + * ctapi.h is not packaged anymore (someone need it?) +* Tue Jan 09 2007 - wr@rosenauer.org +- update to version 2.0.13 +* Thu Dec 28 2006 - wr@rosenauer.org +- update to version 2.0.13beta5 +* Thu Dec 21 2006 - wr@rosenauer.org +- update to version 2.0.13beta3 * Mon Aug 07 2006 - stark@suse.de - added HAL config to map the reader to usb resmgr class (#191958) * Sat May 06 2006 - kukuk@suse.de ++++++ ctapi-cyberjack-2.0.10.tar.bz2 -> ctapi-cyberjack-2.0.14.tar.bz2 ++++++ ++++ 95973 lines of diff (skipped) ++++++ ctapi-cyberjack-rpath.patch ++++++ --- tools/Makefile.in.orig 2006-12-18 17:29:53.000000000 +0100 +++ tools/Makefile.in 2006-12-18 17:29:19.000000000 +0100 @@ -89,7 +89,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@ IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ $(RPATH) LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ ++++++ ctapi-cyberjack-uninitialized.diff ++++++ --- ctapi/ppa/cjppPlatformLinux.c +++ ctapi/ppa/cjppPlatformLinux.c @@ -371,7 +371,7 @@ unsigned long cjppGetUniqueID(void) { /* FIXME */ - unsigned long Result; + unsigned long Result = 0L; debug_out("cjppTerminateThread - not implemented!\n"); #if 0 CFUUIDRef uuid; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org