rpms/ctapi-cyberjack/FC-6 .cvsignore, 1.8, 1.9 ctapi-cyberjack.spec, 1.25, 1.26 sources, 1.8, 1.9
Frank Büttner (frankb)
fedora-extras-commits at redhat.com
Sat Jul 21 09:38:48 UTC 2007
- Previous message: rpms/ctapi-cyberjack/devel .cvsignore, 1.11, 1.12 ctapi-cyberjack.spec, 1.28, 1.29 sources, 1.11, 1.12
- Next message: rpms/bluez-utils/devel .cvsignore, 1.17, 1.18 bluez-utils.spec, 1.58, 1.59 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: frankb
Update of /cvs/extras/rpms/ctapi-cyberjack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv758
Modified Files:
.cvsignore ctapi-cyberjack.spec sources
Log Message:
update to 3.0.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 23 Jun 2007 15:23:38 -0000 1.8
+++ .cvsignore 21 Jul 2007 09:38:16 -0000 1.9
@@ -1 +1 @@
-ctapi-cyberjack-3.0.0.tar.gz
+ctapi-cyberjack-3.0.2.tar.gz
Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/ctapi-cyberjack.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ctapi-cyberjack.spec 23 Jun 2007 16:12:27 -0000 1.25
+++ ctapi-cyberjack.spec 21 Jul 2007 09:38:16 -0000 1.26
@@ -1,11 +1,17 @@
Name: ctapi-cyberjack
Summary: CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version: 3.0.0
-Release: 2%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
Requires: %{_libdir}/ctapi
#ExcludeArch: x86_64
+%if 0%{?rhel} > 4 || 0%{?fedora} > 4
+%define withPCSC 1
BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
+%else
+%define withPCSC 0
+BuildRequires: libusb-devel readline-devel
+%endif
URL: http://mesh.dl.sourceforge.net/sourceforge/libchipcard/ctapi-cyberjack-%{version}.tar.gz
@@ -16,19 +22,23 @@
Source2: ctapi.h
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{withPCSC}
%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir)
%define pcsc_home %{readers_dir}/ifd-cyberjack.bundle/Contents
+%endif
%package devel
Summary: Development files for libctapi-cyberjack
Requires: %{name} = %{version}
Group: Development/Libraries
+%if %{withPCSC}
%package pcsc
Summary: PC/SC Module
Requires: pcsc-lite
Group: Development/Libraries
Provides: pcsc-ifd-handler
+%endif
%package tools
Summary: Some tools for the reader
@@ -62,8 +72,10 @@
%description devel
Development files for libctapi-cyberjack
+%if %{withPCSC}
%description pcsc
Files for the PC/SC system.
+%endif
%description tools
The tool's for read the german Geldkarte, flash the firmware
@@ -74,7 +86,12 @@
%setup -q -n %{name}-%{version}
%build
+%if %{withPCSC}
%configure
+%else
+%configure --disable-pcsc
+%endif
+
make %{?_smp_mflags}
@@ -85,8 +102,8 @@
mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack
mv $RPM_BUILD_ROOT%{_libdir}/libctapi-cyberjack* $RPM_BUILD_ROOT%{_libdir}/ctapi/
# fix for crash when no X server running
- mv $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf
- sed -i "s\flags=0\flags=0x10000\1" $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf
+mv $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf
+sed -i "s\flags=0\flags=0x10000\1" $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf
#remove unnecessary files
rm -f $RPM_BUILD_ROOT/sbin/udev.cyberjack.sh
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/99-cyberjack.rules
@@ -97,6 +114,7 @@
#move the helper script to /usr/bin
mv $RPM_BUILD_ROOT%{_libdir}/cyberjack/getdist.sh $RPM_BUILD_ROOT%{_bindir}/
+%if %{withPCSC}
%post pcsc
#register PC/SC driver and restart daemon
/sbin/service pcscd condrestart||:
@@ -104,11 +122,13 @@
%postun pcsc
#unregister PC/SC driver and restart daemon
/sbin/service pcscd condrestart||:
+%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -124,6 +144,7 @@
%config %{_sysconfdir}/cyberjack.conf
%config %{_sysconfdir}/udev/rules.d/91-cyberjack.rules
+%if %{withPCSC}
%files pcsc
# PC/SC
%dir %{readers_dir}/ifd-cyberjack.bundle
@@ -132,6 +153,7 @@
/%{pcsc_home}/Linux/*
%attr(0644,root,root)/%{pcsc_home}/Info.plist
%attr(0644,root,root)/%{pcsc_home}/PkgInfo
+%endif
%files devel
%defattr(0644,root,root)
@@ -148,6 +170,12 @@
%{_bindir}/getdist.sh
%changelog
+* Sat Jul 21 2007 Frank Büttner <frank-buettner at gmx.net> - 3.0.2-1
+- update to 3.0.2
+
+* Sat Jun 23 2007 Frank Büttner <frank-buettner at gmx.net> - 3.0.0-3%{?dist}
+ - disable PC/SC part for EL4
+
* Sat Jun 23 2007 Frank Büttner <frank-buettner at gmx.net> - 3.0.0-2%{?dist}
- rebuild because of missing file in the cvs system
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 23 Jun 2007 15:23:38 -0000 1.8
+++ sources 21 Jul 2007 09:38:16 -0000 1.9
@@ -1 +1 @@
-5100e348cefb36d5cac3ff8dabd17d4c ctapi-cyberjack-3.0.0.tar.gz
+abf19217c89cfd047b8a15f26ae41140 ctapi-cyberjack-3.0.2.tar.gz
- Previous message: rpms/ctapi-cyberjack/devel .cvsignore, 1.11, 1.12 ctapi-cyberjack.spec, 1.28, 1.29 sources, 1.11, 1.12
- Next message: rpms/bluez-utils/devel .cvsignore, 1.17, 1.18 bluez-utils.spec, 1.58, 1.59 sources, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list