rpms/module-init-tools/F-11 module-init-tools.spec,1.86,1.87

[Jeremy Katz]

Author: katzj

Update of /cvs/pkgs/rpms/module-init-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4491

Modified Files:
	module-init-tools.spec 
Log Message:
* Tue May 19 2009 Jeremy Katz <katzj at redhat.com> - 3.7-9
- Move /etc/modprobe.d/anaconda if it exists (#496261)



Index: module-init-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/module-init-tools/F-11/module-init-tools.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- module-init-tools.spec	11 May 2009 19:53:42 -0000	1.86
+++ module-init-tools.spec	20 May 2009 01:50:57 -0000	1.87
@@ -2,7 +2,7 @@ Summary: Kernel module management utilit
 Name: module-init-tools
 Version: 3.7
 %define PreRelease -pre9
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{PreRelease}.tar.bz2
@@ -12,7 +12,7 @@ Source3: weak-modules
 Source4: depmod-dist.conf
 Source5: modprobe-dist-oss.conf
 Exclusiveos: Linux
-Prereq: /sbin/chkconfig sh-utils
+Prereq: sh-utils
 Obsoletes: modutils-devel modutils
 Provides: modutils = %{version}
 BuildPrereq: zlib-devel docbook-utils
@@ -71,7 +71,9 @@ then
 fi
 
 %post
-# Removed 2.4 compatibility in post-F10 (in F11 onwards).
+if [ -f /etc/modprobe.d/anaconda -a ! -f /etc/modprobe.d/anaconda.conf ]; then
+  mv /etc/modprobe.d/anaconda /etc/modprobe.d/anaconda.conf
+fi
 
 %files
 %defattr(-,root,root)
@@ -82,6 +84,9 @@ fi
 %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
 
 %changelog
+* Tue May 19 2009 Jeremy Katz <katzj at redhat.com> - 3.7-9
+- Move /etc/modprobe.d/anaconda if it exists (#496261)
+
 * Mon May 11 2009 Jon Masters <jcm at redhat.com> - 3.7-8 (pre9)
 - Rename /etc/modprobe.conf to /etc/modprobe.d/local.conf on upgrade (#488768)