From 70a19637b80ef22088788e8d1c24ddffbf6c6d2c Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@fedoraproject.org>
Date: Mon, 19 Jun 2006 07:08:15 +0000
Subject: [PATCH] - changed MODALIAS to ENV{MODALIAS} in the rules file

---
 pcmciautils-014-newrules.patch | 25 +++++++++++++++++++++++++
 pcmciautils.spec               |  7 ++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pcmciautils-014-newrules.patch

diff --git a/pcmciautils-014-newrules.patch b/pcmciautils-014-newrules.patch
new file mode 100644
index 0000000..b0abc5d
--- /dev/null
+++ b/pcmciautils-014-newrules.patch
@@ -0,0 +1,25 @@
+--- 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)
+ # 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.
+-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
+ 		RUN+="/sbin/pcmcia-check-broken-cis"
+ 
+ # 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'"
+ 
+ # PCMCIA sockets:
diff --git a/pcmciautils.spec b/pcmciautils.spec
index 9863c80..552387d 100644
--- a/pcmciautils.spec
+++ b/pcmciautils.spec
@@ -2,7 +2,7 @@ Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 014
-Release: 2
+Release: 3
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
@@ -13,6 +13,7 @@ BuildRequires: sysfsutils-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
 BuildRequires: byacc, flex
 Patch1: pcmciautils-fedora.patch
+Patch2: pcmciautils-014-newrules.patch
 
 %description
 The pcmciautils package contains utilities for initializing and
@@ -22,6 +23,7 @@ debugging PCMCIA and Cardbus sockets.
 %setup -q
 # Fix build peculiarities
 %patch1 -p1
+%patch1 -p2
 
 %build
 make
@@ -41,6 +43,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jun 19 2006 Harald Hoyer <harald@redhat.com> - 014-3
+- changed MODALIAS to ENV{MODALIAS} in the rules file
+
 * Wed Jun  7 2006 Harald Hoyer <harald@redhat.com> - 014-2
 - better buildrequires