SPECS (AC-branch): module-init-tools.spec - HEAD merge

[glen]

Author: glen                         Date: Tue Feb 12 19:37:28 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge

---- Files affected:
SPECS:
   module-init-tools.spec (1.53.2.2 -> 1.53.2.3) 

---- Diffs:

================================================================
Index: SPECS/module-init-tools.spec
diff -u SPECS/module-init-tools.spec:1.53.2.2 SPECS/module-init-tools.spec:1.53.2.3
--- SPECS/module-init-tools.spec:1.53.2.2	Tue Feb 12 17:13:46 2008
+++ SPECS/module-init-tools.spec	Tue Feb 12 20:37:23 2008
@@ -10,11 +10,12 @@
 Summary(uk.UTF-8):	Утиліти для роботи з модулями ядра
 Name:		module-init-tools
 Version:	3.2.2
-Release:	3
-License:	GPL
+Release:	6
+License:	GPL v2+
 Group:		Applications/System
 Source0:	http://kernel.org/pub/linux/utils/kernel/module-init-tools/%{name}-%{version}.tar.bz2
 # Source0-md5:	a1ad0a09d3231673f70d631f3f5040e9
+Source1:	%{name}-blacklist
 # TODO:
 # - update manual to this patch too
 Patch0:		%{name}-modutils.patch
@@ -23,6 +24,7 @@
 Patch3:		%{name}-sparc.patch
 Patch4:		%{name}-modprobe_d.patch
 Patch5:		%{name}-modinfo-kernelversion.patch
+URL:		http://www.kerneltools.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	docbook-dtd41-sgml
@@ -72,22 +74,25 @@
 	mandir=%{_mandir} \
 	INSTALL=install
 
-:> $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.conf
+:> $RPM_BUILD_ROOT/etc/modprobe.conf
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/blacklist.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ ! -s %{_sysconfdir}/modprobe.conf -a -x /sbin/modprobe.modutils -a -f /etc/modules.conf ] && [ -d /lib/modules/`uname -r` ]; then
-	echo "Generating %{_sysconfdir}/modprobe.conf from obsolete /etc/modules.conf"
-	%{_sbindir}/generate-modprobe.conf %{_sysconfdir}/modprobe.conf
+if [ ! -s /etc/modprobe.conf -a -x /sbin/modprobe.modutils -a -f /etc/modules.conf ] && [ -d /lib/modules/`uname -r` ]; then
+	echo "Generating /etc/modprobe.conf from obsolete /etc/modules.conf"
+	%{_sbindir}/generate-modprobe.conf /etc/modprobe.conf
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.conf
-%dir %{_sysconfdir}/modprobe.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.conf
+%dir /etc/modprobe.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/*.conf
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man*/*
 
@@ -97,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53.2.3  2008-02-12 19:37:23  glen
+- HEAD merge
+
 Revision 1.53.2.2  2008-02-12 16:13:46  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/module-init-tools.spec?r1=1.53.2.2&r2=1.53.2.3&f=u