[module-init-tools/f15] Don't search /usr/local for configuration (rhbz: #714023)

[Matthew Garrett]

commit 4fdaf5991c2b8fbb8a8ad29536561863e481fdd5
Author: Matthew Garrett <mjg at redhat.com>
Date:   Mon Jul 18 16:10:30 2011 -0400

    Don't search /usr/local for configuration (rhbz: #714023)

 module-init-tools-fix-nfs-local.patch |   14 ++++++++++++++
 module-init-tools.spec                |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/module-init-tools-fix-nfs-local.patch b/module-init-tools-fix-nfs-local.patch
new file mode 100644
index 0000000..5dd8bd5
--- /dev/null
+++ b/module-init-tools-fix-nfs-local.patch
@@ -0,0 +1,14 @@
+diff -ur module-init-tools-3.16/modprobe.c module-init-tools-3.16.new//modprobe.c
+--- module-init-tools-3.16/modprobe.c	2011-06-02 13:55:01.000000000 -0400
++++ module-init-tools-3.16.new//modprobe.c	2011-07-18 12:46:14.873397253 -0400
+@@ -1427,8 +1427,7 @@
+ 
+ 	/* default config */
+ 	parse_config_scan(conf, dump_only, removing, "/run/modprobe.d",
+-			  "/etc/modprobe.d", "/usr/local/lib/modprobe.d",
+-			  "/lib/modprobe.d", NULL);
++			  "/etc/modprobe.d", "/lib/modprobe.d", NULL);
+ }
+ 
+ /**
+Only in module-init-tools-3.16.new/: modprobe.c~
diff --git a/module-init-tools.spec b/module-init-tools.spec
index 88919e7..470c96b 100644
--- a/module-init-tools.spec
+++ b/module-init-tools.spec
@@ -4,7 +4,7 @@ Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.16
 # Release: 0.1.%{pre_release}%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 #Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2
@@ -16,6 +16,7 @@ Source3: weak-modules
 Source4: depmod-dist.conf
 Source5: modprobe-dist-oss.conf
 Source6: modprobe-dist-alsa.conf
+Patch0: module-init-tools-fix-nfs-local.patch
 Exclusiveos: Linux
 Obsoletes: modutils-devel modutils
 Requires(pre): /sbin/chkconfig sh-utils
@@ -33,6 +34,8 @@ are two examples of loaded and unloaded modules.
 #setup -q -n module-init-tools-%{version}%{pre_release}
 %setup -q -n module-init-tools-%{version}
 
+%patch0 -p1 -b .nfs
+
 %build
 export CC=gcc
 export CFLAGS="$RPM_OPT_FLAGS -DCONFIG_NO_BACKWARDS_COMPAT=1"
@@ -79,6 +82,9 @@ fi
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Mon Jul 18 2011 Matthew Garrett <mjg at redhat.com> 3.16-2
+- Don't search /usr/local for configuration (rhbz: #714023)
+
 * Thu Jun  2 2011 Jon Masters <jcm at jonmasters.org> 3.16-1
 - Update to latest upstream release
 - Remove explicit documentation install hack