diff --git a/pcmciautils-014-newrules.patch b/pcmciautils-014-newrules.patch index 00adcc4..4a38357 100644 --- a/pcmciautils-014-newrules.patch +++ b/pcmciautils-014-newrules.patch @@ -1,5 +1,6 @@ +diff -up pcmciautils-014/udev/rules-modprobe.newrule pcmciautils-014/udev/rules-modprobe --- pcmciautils-014/udev/rules-modprobe.newrule 2006-06-01 11:07:52.000000000 +0200 -+++ pcmciautils-014/udev/rules-modprobe 2007-06-21 11:13:14.000000000 +0200 ++++ pcmciautils-014/udev/rules-modprobe 2007-08-22 13:11:48.000000000 +0200 @@ -1,3 +1,4 @@ +### Already done by the general modprobe rule # modprobe $modalias loads all possibly appropriate modules @@ -7,9 +8,10 @@ - RUN+="/sbin/modprobe $modalias" +#ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ +# RUN+="/sbin/modprobe $env{MODALIAS}" +diff -up pcmciautils-014/udev/rules-base.newrule pcmciautils-014/udev/rules-base --- pcmciautils-014/udev/rules-base.newrule 2006-06-01 11:07:52.000000000 +0200 -+++ pcmciautils-014/udev/rules-base 2007-06-21 11:13:02.000000000 +0200 -@@ -3,12 +3,12 @@ ++++ pcmciautils-014/udev/rules-base 2007-08-22 13:17:40.000000000 +0200 +@@ -3,13 +3,12 @@ # are so broken that we need to read out random bytes of it # instead of the manufactor, card or product ID. Then the # matching is done in userspace. @@ -20,7 +22,8 @@ # However, the "weak" matching by func_id is only allowed _after_ modprobe # returns, so that "strong" matches have a higher priority. -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ -+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ - RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'" +- RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'" ++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}=1 # PCMCIA sockets: + # diff --git a/pcmciautils.spec b/pcmciautils.spec index 2b0566a..a7655f8 100644 --- a/pcmciautils.spec +++ b/pcmciautils.spec @@ -1,10 +1,10 @@ Name: pcmciautils Summary: PCMCIA utilities and initialization programs -License: GPL +License: GPLv2 Version: 014 -Release: 9%{?dist} +Release: 10%{?dist} Group: System Environment/Base -ExclusiveArch: i386 x86_64 ia64 ppc ppc64 +ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm} URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2 Obsoletes: pcmcia-cs < 3.2.9 @@ -54,6 +54,11 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man*/pccardctl* %changelog +* Wed Aug 22 2007 Harald Hoyer - 014-10 +- changed license tag +- added arm architecture +- removed sh execution in udev rule + * Thu Jun 21 2007 Harald Hoyer - 014-9 - fixed modprobe udev rule