From d398533b871d3d998996507ceda415362dc02da5 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Feb 07 2012 00:55:44 +0000
Subject: version 5


---

diff --git a/.gitignore b/.gitignore
index 6daca31..90c1e6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kmod-4.tar.xz
+/kmod-5.tar.xz
diff --git a/kmod.spec b/kmod.spec
index d4cf1e2..d1af3ec 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -1,5 +1,5 @@
 Name:		kmod
-Version:	4
+Version:	5
 Release:	1%{?dist}
 Summary:	Linux kernel module management utilities
 
@@ -17,9 +17,9 @@ BuildRequires:	chrpath
 BuildRequires:	zlib-devel
 BuildRequires:	xz-devel
 
-#Provides:	module-init-tools = 4.0-1
-#Obsoletes:	module-init-tools < 4.0-1
-#Provides:	/sbin/modprobe
+Provides:	module-init-tools = 4.0-1
+Obsoletes:	module-init-tools < 4.0-1
+Provides:	/sbin/modprobe
 
 %description
 The kmod package provides various programs needed for automatic
@@ -49,39 +49,25 @@ applications that wish to load or unload Linux kernel modules.
 %setup -q
 
 %build
-# Install into /bin, /lib* for now. This will move into /usr as part of
-# the planned changes to filesystem layout soon.
 %configure \
-  --bindir=/bin \
-  --with-rootprefix= \
-  --with-rootlibdir=/%{_lib} \
   --with-zlib \
   --with-xz
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# TODO: Fix the upstream rpath issues to avoid doing this (just for now)
-chrpath --delete $RPM_BUILD_ROOT/bin/kmod
-
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-#mkdir -p $RPM_BUILD_ROOT/sbin
-#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/modprobe
-#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/modinfo
-#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/insmod
-#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/rmmod
-#ln -sf ../bin/kmod $RPM_BUILD_ROOT/sbin/depmod
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/*.5*
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/*.8*
-
-mkdir -p $RPM_BUILD_ROOT/lib/modprobe.d
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/modprobe
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/modinfo
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/insmod
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/rmmod
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/depmod
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 
 %post libs -p /sbin/ldconfig
 
@@ -91,26 +77,31 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/depmod.d
 %dir %{_sysconfdir}/modprobe.d
-%dir /lib/modprobe.d
-/bin/kmod
-#/sbin/modprobe
-#/sbin/modinfo
-#/sbin/insmod
-#/sbin/rmmod
-#/sbin/depmod
-#%attr(0644,root,root) %{_mandir}/man5/*.5*
-#%attr(0644,root,root) %{_mandir}/man8/*.8*
+%dir %{_prefix}/lib/modprobe.d
+%{_bindir}/kmod
+%{_sbindir}/modprobe
+%{_sbindir}/modinfo
+%{_sbindir}/insmod
+%{_sbindir}/rmmod
+%{_sbindir}/depmod
+%attr(0644,root,root) %{_mandir}/man5/*.5*
+%attr(0644,root,root) %{_mandir}/man8/*.8*
 %doc NEWS README TODO COPYING
 
 %files libs
-/%{_lib}/libkmod.so*
+%{_libdir}/libkmod.so.*
 
 %files devel
 %{_includedir}/libkmod.h
 %{_libdir}/pkgconfig/libkmod.pc
-/%{_libdir}/libkmod.so*
+%{_libdir}/libkmod.so
 
 %changelog
+* Tue Feb  7 2012 Kay Sievers <kay@redhat.com>
+- Update to version 5
+- replace the module-init-tools package and provide all tools
+  as compatibility symlinks
+
 * Mon Jan 16 2012 Kay Sievers <kay@redhat.com>
 - Update to version 4
 - set --with-rootprefix=
diff --git a/sources b/sources
index 8e810d0..4b6088f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e14450a066a48accd0af1995b3c0232d  kmod-4.tar.xz
+b271c2ec54aba1c67bda63c8579d8c15  kmod-5.tar.xz