diff --git a/91-cyberjack.rules.old b/91-cyberjack.rules.old new file mode 100644 index 0000000..8e5f606 --- /dev/null +++ b/91-cyberjack.rules.old @@ -0,0 +1 @@ +BUS=="usb", SYSFS{idVendor}=="0c4b", GROUP="ctapiusers", MODE="660" diff --git a/ctapi-cyberjack.spec b/ctapi-cyberjack.spec index c77ac04..db07f0c 100644 --- a/ctapi-cyberjack.spec +++ b/ctapi-cyberjack.spec @@ -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: 2%{?dist} +Release: 3%{?dist} Requires(pre): group(ctapiusers) Requires: %{_libdir}/ctapi #ExcludeArch: x86_64 @@ -13,6 +13,11 @@ BuildRequires: libusb-devel readline-devel pcsc-lite-devel >= 1.3.0 %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 @@ License: LGPL 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 @@ sed -i "s\flags=0\flags=0x10000\1" $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf 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,7 +181,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/getdist.sh %changelog -*Sat Aug 04 2007 Frank Büttner - 3.0.3-1 +*Mon Aug 06 2007 Frank Büttner - 3.0.3-3 + - apply fix only for F7 an newer + +*Sat Aug 04 2007 Frank Büttner - 3.0.3-2 - fix #246842 (change udev rules) *Sat Jul 28 2007 Frank Büttner - 3.0.3-1