diff --git a/pcmciautils-014-newrules.patch b/pcmciautils-014-newrules.patch index b0abc5d..39504a5 100644 --- a/pcmciautils-014-newrules.patch +++ b/pcmciautils-014-newrules.patch @@ -1,14 +1,6 @@ ---- pcmciautils-014/udev/60-pcmcia.rules.newrules 2006-06-19 09:03:01.000000000 +0200 -+++ pcmciautils-014/udev/60-pcmcia.rules 2006-06-19 09:04:08.000000000 +0200 -@@ -1,19 +1,19 @@ - # PCMCIA devices: - # - # modprobe $modalias loads all possibly appropriate modules --ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ -+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ - RUN+="/sbin/modprobe $modalias" - - # Very few CIS firmware entries (which we use for matching) +--- pcmciautils-014/udev/rules-base.newrules 2006-06-19 09:12:29.000000000 +0200 ++++ pcmciautils-014/udev/rules-base 2006-06-19 09:12:58.000000000 +0200 +@@ -3,12 +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. @@ -23,3 +15,10 @@ RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'" # PCMCIA sockets: +--- pcmciautils-014/udev/rules-modprobe.newrules 2006-06-19 09:12:38.000000000 +0200 ++++ pcmciautils-014/udev/rules-modprobe 2006-06-19 09:13:12.000000000 +0200 +@@ -1,3 +1,3 @@ + # modprobe $modalias loads all possibly appropriate modules +-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ ++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ + RUN+="/sbin/modprobe $modalias" diff --git a/pcmciautils.spec b/pcmciautils.spec index 552387d..1f973ae 100644 --- a/pcmciautils.spec +++ b/pcmciautils.spec @@ -23,7 +23,7 @@ debugging PCMCIA and Cardbus sockets. %setup -q # Fix build peculiarities %patch1 -p1 -%patch1 -p2 +%patch2 -p1 %build make