rpms/ctapi-cyberjack/EL-4 91-cyberjack.rules.old, NONE, 1.1 91-cyberjack.rules, 1.2, 1.3 ctapi-cyberjack.spec, 1.28, 1.29

[Frank Büttner (frankb)]

Author: frankb

Update of /cvs/pkgs/rpms/ctapi-cyberjack/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13120

Modified Files:
	91-cyberjack.rules ctapi-cyberjack.spec 
Added Files:
	91-cyberjack.rules.old 
Log Message:
apply udev fix only for F7 an newer



--- NEW FILE 91-cyberjack.rules.old ---
BUS=="usb", SYSFS{idVendor}=="0c4b", GROUP="ctapiusers", MODE="660"


Index: 91-cyberjack.rules
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/91-cyberjack.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 91-cyberjack.rules	28 Jul 2007 07:06:19 -0000	1.2
+++ 91-cyberjack.rules	6 Aug 2007 17:56:45 -0000	1.3
@@ -1 +1 @@
-BUS=="usb", SYSFS{idVendor}=="0c4b", GROUP="ctapiusers", MODE="660"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0c4b", GROUP="ctapiusers", MODE="660"


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/EL-4/ctapi-cyberjack.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ctapi-cyberjack.spec	28 Jul 2007 07:06:19 -0000	1.28
+++ ctapi-cyberjack.spec	6 Aug 2007 17:56:45 -0000	1.29
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
 Version:	3.0.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -13,6 +13,11 @@
 %define withPCSC 0
 BuildRequires:  libusb-devel readline-devel
 %endif
+%if 0%{?fedora} > 6
+%define useNewUdev 1
+%else
+%define useNewUdev 0
+%endif
 
 URL:		http://mesh.dl.sourceforge.net/sourceforge/libchipcard/ctapi-cyberjack-%{version}.tar.gz		
 
@@ -20,7 +25,8 @@
 Group: 		Development/Libraries
 Source0: 	%{name}-%{version}.tar.gz
 Source1:	91-cyberjack.rules
-Source2:	ctapi.h
+Source2:        91-cyberjack.rules.old
+Source3:	ctapi.h
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{withPCSC}
@@ -109,9 +115,13 @@
 rm -f $RPM_BUILD_ROOT/sbin/udev.cyberjack.sh
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/99-cyberjack.rules
 #use my own udev file, because the orginal is more forSuSE 
+%if %{useNewUdev}
 install -c -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/91-cyberjack.rules
+%else
+install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/91-cyberjack.rules
+%endif
 # add the header, because the orginal was removed
-install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h 
+install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h 
 #move the helper script to /usr/bin
 mv $RPM_BUILD_ROOT%{_libdir}/cyberjack/getdist.sh $RPM_BUILD_ROOT%{_bindir}/
 
@@ -171,6 +181,12 @@
 %{_bindir}/getdist.sh
 
 %changelog
+*Mon Aug 06 2007 Frank Büttner <frank-buettner at gmx.net> - 3.0.3-3
+ - apply fix only for F7 an newer
+
+*Sat Aug 04 2007 Frank Büttner <frank-buettner at gmx.net> - 3.0.3-2
+ - fix #246842 (change udev rules)
+ 
 *Sat Jul 28 2007 Frank Büttner <frank-buettner at gmx.net> - 3.0.3-1
  - update to 3.0.3
  - next fix for the "only root problem"