rpms/ctapi-cyberjack/devel ctapi-cyberjack.spec,1.2,1.3

[Frank Büttner (frankb)]

Author: frankb

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

Modified Files:
	ctapi-cyberjack.spec 
Log Message:
- wrong spec files was used:(



Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/extras/rpms/ctapi-cyberjack/devel/ctapi-cyberjack.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ctapi-cyberjack.spec	27 May 2006 11:48:00 -0000	1.2
+++ ctapi-cyberjack.spec	27 May 2006 11:56:43 -0000	1.3
@@ -1,46 +1,46 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
 Version:	2.0.10
-Release:	1_FC4
-BuildRequires:	libusb, readline-devel, ncurses-devel, kernel-devel 
+Release:	2%{?dist}
+Requires:	%{_libdir}/ctapi
+#kernel-devel needed for workaround bug 191515
+#For FC>4
+BuildRequires:	libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 kernel-devel
+#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
 
 License: 	LGPL
-Group: 		System Environment/Libraries
+Group: 		Development/Libraries
 Source: 	%{name}-%{version}.tar.bz2
-Patch0:		ctapi-cyberjack-2.0.4-rh73_old_libusb.patch
-Buildroot: 	%{_tmppath}/ctapi-cyberjack-%{version}-%{release}-root
-
-#%define prefix 		/usr
-#%define lib_dir		%{prefix}/lib
-%define readers_dir	%{_libdir}/readers
-
-%package ifd-handler
-Summary:	cyberjack PC/SC IFD handler for pcsc-lite
-Requires:	%{name} = %{version}
-Group:		System Environment/Libraries
-
-%description ifd-handler
-REINER SCT cyberJack pinpad/e-com USB user space driver
-
-This package includes the PC/SC IFD handler driver for the cyberJack
-pinpad/e-com USB chipcard reader.
-
+Patch0:		ctapi-cyberjack_MakefileCtAPI.patch
+Patch1:		ctapi-cyberjack_MakefilePCSC.patch
+Patch2:		ctapi-cyberjack_Bug_191515.patch
+Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+#for FC4
+#%%define readers_dir %{_libdir}/readers/ifd-cyberjack.bundle/Contents
+#for FC>4
+%define readers_dir %(pkg-config libpcsclite --variable=usbdropdir)/ifd-cyberjack.bundle/Contents
 
 %package devel
 Summary:	Development files for libctapi-cyberjack
 Requires:	%{name} = %{version}
 Group:		Development/Libraries
 
+%package pcsc
+Summary:	PC/SC Module
+Requires:	pcsc-lite 
+Group:          Development/Libraries
+Provides:	pcsc-ifd-handler
+
 %description
 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.
 
-This package changes the permissions of /dev/ttyUSB devices 0-3 to
-2666. This gives the users the possibility to access the devices and
-enables mandatory locking.
-
 The kernel side driver is included in the official linux kernel starting
 with version 2.4.6.
 
@@ -49,111 +49,183 @@
 controllers.
 
 For more information about the reader, software updates and a shop see
-http://www.reiner-sct.com/
+http://www.reiner-sct.com
+
+			WARNING 
+Use the tool ctsh only when you know what you are doing!!!
+Or you can damage your SmartCard!!!
+
+			Hint
+When using the CT-API lib you must first stop the PC/SC daemon,
+when you use it.
 
 %description devel
 Development files for libctapi-cyberjack
 
+%description pcsc
+Files for the PC/SC system.
+
 %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
-##Fedora korrektur
-sed -e "s/CFLAGS+=\ -I\/usr\/local\/include\ -I\/usr\/include/CFLAGS+=\ -I\/usr\/local\/include\ -I\/lib\/modules\/$(uname -r)\/source\/include\ -I\/usr\/include/g" makevars >makevars.neu
-mv makevars.neu makevars
-make
+#make %{?_smp_mflags} will fail!!!
+make 
 
 %install
-if [ -n "%{buildroot}" ] ; then
-   [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-fi
+rm -rf $RPM_BUILD_ROOT
+
 # CT-API
-mkdir -p %{buildroot}/%{readers_dir}
-install -m 755 ctapi/libctapi-cyberjack.so %{buildroot}/%{readers_dir}/libctapi-cyberjack.so.%{version}
-install -m 755 ctapi/libctapi-cyberjack.a %{buildroot}/%{readers_dir}/libctapi-cyberjack.a
-( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so.%{version} libctapi-cyberjack.so )
-( cd %{buildroot}/%{readers_dir}; ln -s libctapi-cyberjack.so libctapi.so )
-( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi.so libctapi.so )
-( cd %{buildroot}/%{_libdir}; ln -s %{readers_dir}/libctapi-cyberjack.a libctapi-cyberjack.a )
-mkdir -p %{buildroot}/%{_includedir}
-install -m 644 ctapi/include/ctapi.h %{buildroot}/%{_includedir}/ctapi.h
-mkdir -p %{buildroot}/%{_bindir}
-install -m 755 tools/cjgeldkarte %{buildroot}/%{_bindir}/cjgeldkarte
-install -m 755 tools/ctsh %{buildroot}/%{_bindir}/ctsh
+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
-#mkdir -p %{buildroot}/%{readers_dir}
-mkdir -p %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux
-install -m 755 pcsc/ifd-cyberjack.bundle/Contents/Linux/ifd-cyberjack.so %{buildroot}/%{readers_dir}/libcyberjack_ifd.so.%{version}
-install -m 444 pcsc/ifd-cyberjack.bundle/Contents/Info.plist %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist
-install -m 444 pcsc/ifd-cyberjack.bundle/Contents/PkgInfo %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo
-( cd %{buildroot}/%{readers_dir}; ln -s libcyberjack_ifd.so.%{version} libcyberjack_ifd.so )
-( cd %{buildroot}/%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux; ln -s %{readers_dir}/libcyberjack_ifd.so cyberjack-ifd.so )
-mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d
-install -m 644 etc/reader.conf %{buildroot}%{_sysconfdir}/reader.conf.d/cyberjack.conf
-
-%pre
-groupadd -r cyberjack 2>/dev/null || :
-
-%post ifd-handler
-/usr/sbin/update-reader.conf
-
-%post
-if [ -e /dev/ttyUSB0 ] ; then
-   chmod 2666 /dev/ttyUSB0
-else
-   mknod -m 2666 /dev/ttyUSB0 c 188 0
-fi
-if [ -e /dev/ttyUSB1 ] ; then
-   chmod 2666 /dev/ttyUSB1
-else
-   mknod -m 2666 /dev/ttyUSB1 c 188 1
-fi
-if [ -e /dev/ttyUSB2 ] ; then
-   chmod 2666 /dev/ttyUSB2
-else
-   mknod -m 2666 /dev/ttyUSB2 c 188 2
-fi
-if [ -e /dev/ttyUSB3 ] ; then
-   chmod 2666 /dev/ttyUSB3
-else
-   mknod -m 2666 /dev/ttyUSB3 c 188 3
-fi
+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
+
+%post pcsc
+#register PC/SC driver  and restart daemon
+/sbin/service pcscd condrestart||: 
+
+%postun pcsc
+#unregister PC/SC driver and restart daemon
+/sbin/service pcscd condrestart||:
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %clean
-if [ -n "%{buildroot}" ] ; then
-   [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-fi
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root)
-%doc COPYRIGHT.GPL COPYRIGHT.LGPL doc/README.pdf doc/README.html doc/README.txt MAKEUSBDEV tools/ctshrc.example
+%doc COPYRIGHT* 
+%doc doc/README.txt
+%doc doc/README.pdf
+%doc doc/README.html
+
+%defattr(-,root,root,-)
 # CT-API
-%{readers_dir}/libctapi-cyberjack.so.%{version}
-%{readers_dir}/libctapi-cyberjack.so
-%{readers_dir}/libctapi.so
-%{_libdir}/libctapi.so
-%attr(0755,root,root) %{_bindir}/cjgeldkarte
-%attr(0755,root,root) %{prefix}/bin/ctsh
+%{_libdir}/ctapi/libctapi-cyberjack.so
+%{_bindir}/cjgeldkarte
+%{_bindir}/ctsh
 
+%files pcsc
 # PC/SC
-%files ifd-handler
-/%{readers_dir}/libcyberjack_ifd.so.%{version}
-/%{readers_dir}/libcyberjack_ifd.so
-%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/PkgInfo
-%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Info.plist
-%{_libdir}/pcsc/readers/ifd-cyberjack.bundle/Contents/Linux/cyberjack-ifd.so
-%{_sysconfdir}/reader.conf.d/cyberjack.conf
+%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
 
 %files devel
 %defattr(0644,root,root)
-%{_includedir}/ctapi.h
-%{readers_dir}/libctapi-cyberjack.a
-%{_libdir}/libctapi-cyberjack.a
-
-%changelog -n ctapi-cyberjack
-* Mon May 30 2005 - Harald Welte <hwelte at hmw-consulting.de>
-+ ctapi-cyberjack-2.0.9-1
-- add pcsc-lite 'dropdir' compatible PC/SC driver
+%{_includedir}/ctapi-cyberjack/ctapi.h
+
+%changelog 
+* Sat May 27 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.10-2%{?dist}
+- add "Provides:pcsc-ifd-handler" for the PC/SC part
+
+* Fri May 12 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.10-1%{?dist}
+- update driver to 2.0.10
+- readers.conf now unnessery
+
+* Thu May 11 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-13%{?dist}
+- rename -soname for the PC/SC part from libcyberjack_ifd.so.0 to
+  libcyberjack_ifd.so
+- fix place for the comments of /sbin/service pcscd condrestart
+
+* Wed May 10 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-12%{?dist}
+- fix comments for %%post/%%postun pcsc
+- fix call of restart the PC/SC daemon
+- move to the old version of dependency for the PC/SC package
+- add -soname option in PS/SC driver
+
+* Tue May 9 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-11%{?dist}
+- remove comments at %%post and %%postun
+- remove unneeded /usr/sbin/update-reader.conf call
+
+* Mon May 8 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-10%{?dist}
+- fix ldconfig for the PC/SC part
+- fix dependency for the PC/SC package
+- fix build dependency for the package.
+
+* Mon May 8 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-9%{?dist}
+- restart PC/SC daemon only when it run's
+- fix CT-API version bug so that apps can find it in the ldcache via 
+  libctapi-cyberjack.so
+- add comment about using CT-API and PC/SC together
+
+* Sun May 7 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-8%{?dist}
+- add requirement of the ctapi dir under %{_libdir}
+- the CT-API lib lives now under %{_libdir}/ctapi
+- reenable link the ctapi driver static in the PC/SC part
+- run ldconfig after install/uninstall
+
+* Mon May 1 2006 Frank Büttner  <frank-buettner at gmx.net> - 2.0.8-7%{?dist}
+- fix permission of ctapi-cyberjack-2.0.8.tar.bz2 and ctapi-cyberjack.spec
+- fix permisson of the PC/SC config file
+- restart PC/SC daemon after remove the PS/SC driver
+
+* Sun Apr 30 2006 Frank Büttner  <frank-buettner at gmx.net> - 2.0.8-6%{?dist}
+- replace if statements with comments
+- replace german to english comments
+- fix the makefile for the CT-API lib
+- correct naming the libs CT-API and PS/SC 
+- rename package PS/SC to pcsc
+- replace RPM_BUILD_ROOT 
+- fix doc
+- add warning for the tool ctsh
+
+* Thu Apr 27 2006 Frank Büttner  <frank-buettner at gmx.net> - 2.0.8-5%{dist}
+- fix owner of lib's
+- add PC/SC fix for FC5
+- restart pcscd
+
+* Thu Apr 27 2006 Frank Büttner  <frank-buettner at gmx.net> - 2.0.8-4%{dist}
+- change permisson of all lib's to 0755
+- rename lib files to support more reader's
+- fix the path of the CT-API part and the devel file
+- support FC4 and FC5
+
+* Sat Apr 15 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-3%{dist}
+- remove makefile workaround
+
+* Sat Apr 15 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-2%{dist}
+- remove packager
+- remove hardcodet Fedora Tag
+- rename file from ctapi-cyberjack-version to ctapi-cyberjack
+- modify source URL
+- fix clean section
+
+* Sat Apr 08 2006 Frank Büttner <frank-buettner at gmx.net> - 2.0.8-1.FC4
+- start for Fedora
+- sepperate the PC/SC part
 
 * Wed Mar 02 2005 - Harald Welte <hwelte at hmw-consulting.de>
 + ctapi-cyberjack-2.0.8-1