rpms/pcmciautils/devel pcmciautils-014-newrules.patch, 1.2, 1.3 pcmciautils.spec, 1.25, 1.26

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/pcmciautils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28343

Modified Files:
	pcmciautils-014-newrules.patch pcmciautils.spec 
Log Message:
- fixed modprobe udev rule

pcmciautils-014-newrules.patch:

Index: pcmciautils-014-newrules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils-014-newrules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcmciautils-014-newrules.patch	19 Jun 2006 07:13:25 -0000	1.2
+++ pcmciautils-014-newrules.patch	21 Jun 2007 09:26:27 -0000	1.3
@@ -1,5 +1,14 @@
---- 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
+--- 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
+@@ -1,3 +1,4 @@
++### Already done by the general modprobe rule
+ # modprobe $modalias loads all possibly appropriate modules
+-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
+-		RUN+="/sbin/modprobe $modalias"
++#ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
++#		RUN+="/sbin/modprobe $env{MODALIAS}"
+--- 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 @@
  # are so broken that we need to read out random bytes of it
  # instead of the manufactor, card or product ID. Then the
@@ -15,10 +24,3 @@
  		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"


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pcmciautils.spec	6 Jun 2007 10:48:33 -0000	1.25
+++ pcmciautils.spec	21 Jun 2007 09:26:27 -0000	1.26
@@ -2,7 +2,7 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 014
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
@@ -28,7 +28,7 @@
 %setup -q
 # Fix build peculiarities
 %patch1 -p1
-%patch2 -p1
+%patch2 -p1 -b .newrule
 %patch3 -p1
 
 %build
@@ -54,6 +54,9 @@
 %{_mandir}/man*/pccardctl*
 
 %changelog
+* Thu Jun 21 2007 Harald Hoyer <harald at redhat.com> - 014-9
+- fixed modprobe udev rule
+
 * Wed Jun  6 2007 Harald Hoyer <harald at redhat.com> - 014-8
 - fixed 'pccardctl ident' SEGV
 - Resolves: rhbz#242805