rpms/ctapi-cyberjack/devel .cvsignore, 1.3, 1.4 ctapi-cyberjack.spec, 1.11, 1.12 sources, 1.3, 1.4 ctapi-cyberjack_Bug_191515.patch, 1.1, NONE ctapi-cyberjack_MakefileCtAPI.patch, 1.2, NONE ctapi-cyberjack_MakefilePCSC.patch, 1.2, NONE

[Frank Büttner (frankb)]

Author: frankb

Update of /cvs/extras/rpms/ctapi-cyberjack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1137

Modified Files:
	.cvsignore ctapi-cyberjack.spec sources 
Removed Files:
	ctapi-cyberjack_Bug_191515.patch 
	ctapi-cyberjack_MakefileCtAPI.patch 
	ctapi-cyberjack_MakefilePCSC.patch 
Log Message:
update to version 2.0.11 of the driver lib



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 May 2006 12:19:19 -0000	1.3
+++ .cvsignore	16 Sep 2006 14:14:07 -0000	1.4
@@ -1 +1 @@
-ctapi-cyberjack-2.0.10.tar.bz2
+ctapi-cyberjack-2.0.11.tar.gz


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ctapi-cyberjack.spec	11 Sep 2006 08:00:14 -0000	1.11
+++ ctapi-cyberjack.spec	16 Sep 2006 14:14:07 -0000	1.12
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	2.0.10
-Release:	7%{?dist}
+Version:	2.0.11
+Release:	1%{?dist}
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	ppc
 
@@ -11,14 +11,11 @@
 #For FC4
 #BuildRequires:  libusb-devel readline-devel kernel-devel
 
-URL:		http://support.reiner-sct.de/downloads/LINUX/V2.0.10/ctapi-cyberjack-2.0.10.tar.bz2
+URL:		http://support.reiner-sct.de/downloads/LINUX/V2.0.11/ctapi-cyberjack-2.0.11.tar.gz
 
 License: 	LGPL
 Group: 		Development/Libraries
-Source: 	%{name}-%{version}.tar.bz2
-Patch0:		ctapi-cyberjack_MakefileCtAPI.patch
-Patch1:		ctapi-cyberjack_MakefilePCSC.patch
-Patch2:		ctapi-cyberjack_Bug_191515.patch
+Source: 	%{name}-%{version}.tar.gz
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #for FC4
@@ -70,45 +67,17 @@
 %prep
 %setup -q -n %{name}-%{version}
 
-#fix path for the driver lib the config file 
-#	sed -i "s\/usr/lib/readers/libcyberjack_ifd.so\%{readers_dir}/libcyberjack_ifd.so\1" \
-#		etc/reader.conf 
-
-#fix reader.conf for FC>4
-#	sed -i "s\REINERSCT_CYBERJACK_USB\/dev/null\1" etc/reader.conf
-
-%patch0 -p1 
-%patch1 -p1
-
-#fix for bug 191515
-%patch2 -p1
-sed -i "s|XX|%(uname -r)|1" makevars
-
 %build
+./configure --disable-static
 #make %{?_smp_mflags} will fail!!!
-make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-# CT-API
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 ctapi/libctapi-cyberjack.so $RPM_BUILD_ROOT%{_libdir}/ctapi/libctapi-cyberjack.so
-install -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h
-install -m 755 tools/cjgeldkarte $RPM_BUILD_ROOT%{_bindir}/cjgeldkarte
-install -m 755 tools/ctsh $RPM_BUILD_ROOT%{_bindir}/ctsh
-
-# PC/SC
-install -d  -m 755 $RPM_BUILD_ROOT%{readers_dir}/Linux
-install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so $RPM_BUILD_ROOT%{readers_dir}/Linux/ifd-cyberjack.so
-install -m 644 pcsc/ifd-cyberjack.bundle/Contents/Info.plist  $RPM_BUILD_ROOT%{readers_dir}/Info.plist
-install -m 644 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo  $RPM_BUILD_ROOT%{readers_dir}/PkgInfo
-
-#install -m 755 pcsc/libcyberjack_ifd.so $RPM_BUILD_ROOT%{readers_dir}/libcyberjack_ifd.so
-#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
-#install -m 444 etc/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/cyberjack.conf
+make DESTDIR=$RPM_BUILD_ROOT install
+mkdir $RPM_BUILD_ROOT/%{_libdir}/ctapi
+mkdir $RPM_BUILD_ROOT/%{_includedir}/ctapi-cyberjack
+mv $RPM_BUILD_ROOT/%{_libdir}/libctapi-cyberjack* $RPM_BUILD_ROOT/%{_libdir}/ctapi/
+mv $RPM_BUILD_ROOT/%{_includedir}/ctapi.h $RPM_BUILD_ROOT/%{_includedir}/ctapi-cyberjack/
 
 %post pcsc
 #register PC/SC driver  and restart daemon
@@ -133,25 +102,28 @@
 
 %defattr(-,root,root,-)
 # CT-API
-%{_libdir}/ctapi/libctapi-cyberjack.so
+%{_libdir}/ctapi/libctapi-cyberjack.so.*
 %{_bindir}/cjgeldkarte
 %{_bindir}/ctsh
+%{_bindir}/ctpin
+%{_sysconfdir}/*
 
 %files pcsc
 # PC/SC
-%defattr(755,root,root)
+#%defattr(755,root,root)
 /%{readers_dir}/Linux/*
 %attr(0644,root,root)/%{readers_dir}/Info.plist
- %attr(0644,root,root)/%{readers_dir}/PkgInfo
-#%attr(644,root,root) %config(noreplace) %{_sysconfdir}/reader.conf.d/cyberjack.conf
+%attr(0644,root,root)/%{readers_dir}/PkgInfo
 
 %files devel
 %defattr(0644,root,root)
 %{_includedir}/ctapi-cyberjack/ctapi.h
+%{_libdir}/ctapi/libctapi-cyberjack.so
+%{_libdir}/ctapi/libctapi-cyberjack.la
 
 %changelog 
-* Mon Sep 11 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.10-7%{?dist}
-- second rebuild for FC6
+* Sat Sep 16 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.11-1%{?dist}
+- update to 2.0.11
 
 * Mon Jul 24 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.10-6%{?dist}
 - fix ncurses-devel build requires  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 May 2006 12:19:19 -0000	1.3
+++ sources	16 Sep 2006 14:14:07 -0000	1.4
@@ -1 +1 @@
-339b4a1b2117550c0be92e5609f0729e  ctapi-cyberjack-2.0.10.tar.bz2
+4c6c324a7d76fac0069013bcec549b4d  ctapi-cyberjack-2.0.11.tar.gz


--- ctapi-cyberjack_Bug_191515.patch DELETED ---


--- ctapi-cyberjack_MakefileCtAPI.patch DELETED ---


--- ctapi-cyberjack_MakefilePCSC.patch DELETED ---