|
@@ -1,13 +1,13 @@
|
|
|
Summary: Kernel module management utilities.
|
|
|
Summary(ja): カーネルモジュール管理ユーティリティ
|
|
|
Name: module-init-tools
|
|
|
-Version: 3.12
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 3.16
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: GPLv2+
|
|
|
Group: System Environment/Kernel
|
|
|
-Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2
|
|
|
-Source1: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2.sign
|
|
|
-Source2: modprobe-dist.conf
|
|
|
+Source: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.gz
|
|
|
+Source1: http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.gz.sign
|
|
|
+#Source2: modprobe-dist.conf
|
|
|
Source3: weak-modules
|
|
|
Source4: depmod-dist.conf
|
|
|
|
|
@@ -52,15 +52,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
install -m 755 generate-modprobe.conf \
|
|
|
$RPM_BUILD_ROOT/sbin
|
|
|
|
|
|
-install -m 644 modprobe.conf.5 \
|
|
|
- $RPM_BUILD_ROOT/%{_mandir}/man5/modprobe.d.5
|
|
|
-
|
|
|
-install -m 644 depmod.conf.5 \
|
|
|
- $RPM_BUILD_ROOT/%{_mandir}/man5/depmod.d.5
|
|
|
-
|
|
|
-mkdir -p $RPM_BUILD_ROOT/etc
|
|
|
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
|
|
|
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/modprobe-dist.conf
|
|
|
+mkdir -p $RPM_BUILD_ROOT/lib/modprobe.d
|
|
|
+
|
|
|
+#install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/modprobe-dist.conf
|
|
|
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/sbin/weak-modules
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/etc/depmod.d
|
|
@@ -69,24 +64,31 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/depmod.d/depmod-dist.conf
|
|
|
mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin
|
|
|
|
|
|
touch $RPM_BUILD_ROOT/etc/modprobe.d/modprobe.conf
|
|
|
+touch $RPM_BUILD_ROOT/etc/modprobe.d/local.conf
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
-%post
|
|
|
-if [ -f /etc/modprobe.conf -a ! -f /etc/modprobe.d/modprobe.conf ] ; then
|
|
|
- mv -f /etc/modprobe.conf /etc/modprobe.d/modprobe.conf
|
|
|
+%pre
|
|
|
+if [ -e /etc/modprobe.conf ] && [ ! -e /etc/modprobe.d/local.conf ]
|
|
|
+then
|
|
|
+ mv /etc/modprobe.conf /etc/modprobe.d/local.conf
|
|
|
fi
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
/etc/modprobe.d
|
|
|
+/lib/modprobe.d
|
|
|
/etc/depmod.d
|
|
|
/sbin/*
|
|
|
%{_mandir}/*/*
|
|
|
%ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/modprobe.conf
|
|
|
+%ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jan 07 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.16-1
|
|
|
+- update to 3.16
|
|
|
+
|
|
|
* Tue Apr 19 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.12-2
|
|
|
- add BR: glibc-static
|
|
|
- add V/D/P tags
|