rpms/module-init-tools/FC-4 blacklist-compat, 1.1, 1.2 module-init-tools.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/module-init-tools/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv18693

Modified Files:
	blacklist-compat module-init-tools.spec 
Log Message:
- added /etc/modprobe.conf.dist with config(missingok)


Index: blacklist-compat
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/blacklist-compat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blacklist-compat	2 Feb 2006 15:26:30 -0000	1.1
+++ blacklist-compat	22 Feb 2006 08:51:14 -0000	1.2
@@ -30,6 +30,7 @@
 blacklist tdfxfb
 blacklist virgefb
 blacklist vga16fb
+blacklist matroxfb_base
 
 # ISDN - see bugs 154799, 159068
 blacklist hisax


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/module-init-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- module-init-tools.spec	2 Feb 2006 15:25:18 -0000	1.13
+++ module-init-tools.spec	22 Feb 2006 08:51:14 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.0.FC4.1
+Release: 0.%{preversion}.0.FC4.2
 License: GPL
 Group: System Environment/Kernel
 Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2
@@ -65,6 +65,9 @@
 
 install -m 755 insmod-static $RPM_BUILD_ROOT/sbin/insmod.static
 touch $RPM_BUILD_ROOT/etc/modprobe.conf
+cat > $RPM_BUILD_ROOT/etc/modprobe.conf.dist <<EOF
+# empty file, can be removed, if it is not included by /etc/modprobe.conf
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,8 +93,12 @@
 /sbin/*
 %{_mandir}/*/*
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
+%config(missingok) %verify(not md5 size mtime) /etc/modprobe.conf.dist
 
 %changelog
+* Tue Feb 21 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.2
+- added /etc/modprobe.conf.dist with config(missingok)
+
 * Thu Feb 02 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.1
 - FC4 version with fb modules blacklisted