[kmod] version 4

[Kay Sievers]

commit 706525306b0e8272c6819e9ab400561d719bb2a8
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Mon Jan 16 21:24:37 2012 +0100

    version 4

 .gitignore                   |    3 +-
 kmod-2-with-rootlibdir.patch |  173 ------------------------------------------
 kmod.spec                    |   76 +++++++++----------
 sources                      |    2 +-
 4 files changed, 39 insertions(+), 215 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db8cbbb..6daca31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kmod-2.tar.xz
-/kmod-3.tar.xz
+/kmod-4.tar.xz
diff --git a/kmod.spec b/kmod.spec
index 44edd61..d4cf1e2 100644
--- a/kmod.spec
+++ b/kmod.spec
@@ -1,5 +1,5 @@
 Name:		kmod
-Version:	3
+Version:	4
 Release:	1%{?dist}
 Summary:	Linux kernel module management utilities
 
@@ -13,13 +13,13 @@ Source0:	http://packages.profusion.mobi/kmod/%{name}-%{version}.tar.xz
 Exclusiveos:	Linux
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires:	chrpath
+BuildRequires:	zlib-devel
+BuildRequires:	xz-devel
 
-BuildRequires:	zlib-devel chrpath
-
-# TODO: Investigate the following and determine prefered policy guide
-# Fedora Renaming/Replacing Existing Packages policy (review/FIXME)
 #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
@@ -45,46 +45,40 @@ Requires:	%{name} = %{version}-%{release}
 The kmod-devel package provides header files used for development of
 applications that wish to load or unload Linux kernel modules.
 
-
 %prep
 %setup -q
 
-
 %build
-# Initially configure into /sbin in line with existing tools. This may well
-# move into /usr as part of the planned changes to filesystem layout soon.
-%configure --disable-static --bindir=/bin --with-rootlibdir=/%{_lib}
+# 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}
-# TODO: add a doc target here
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# TODO: Initially these are installed in /sbin like module-init-tools
-# TODO: That *cannot* change for the moment (but explicitly noted here)
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # TODO: Fix the upstream rpath issues to avoid doing this (just for now)
 chrpath --delete $RPM_BUILD_ROOT/bin/kmod
-#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-depmod
-#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-insmod
-#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-lsmod
-#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-modinfo
-#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-modprobe
-#chrpath --delete $RPM_BUILD_ROOT/bin/kmod-rmmod
-
-mkdir -p $RPM_BUILD_ROOT/etc
-mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
-
-# New configuration files we ship (if any) should go into /lib/modprobe.d
-# in order to allow the local sysadmin to customize /etc/modprobe.d
-# NOTE: These do not use macros because we always want "/lib" (no multilib)
-mkdir -p $RPM_BUILD_ROOT/lib
-mkdir -p $RPM_BUILD_ROOT/lib/modprobe.d
 
-mkdir -p $RPM_BUILD_ROOT/etc/depmod.d
-# We used to create a depmod "dist.conf" but do not use that any more
+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%{_sysconfdir}/modprobe.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,18 +89,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-# TODO: Add documentation files and man pages
 %dir %{_sysconfdir}/depmod.d
 %dir %{_sysconfdir}/modprobe.d
-# NOTE: always /lib even on systems with /lib64 (there is no macro available)
 %dir /lib/modprobe.d
 /bin/kmod
-#/bin/kmod-depmod
-#/bin/kmod-insmod
-#/bin/kmod-lsmod
-#/bin/kmod-modinfo
-#/bin/kmod-modprobe
-#/bin/kmod-rmmod
+#/sbin/modprobe
+#/sbin/modinfo
+#/sbin/insmod
+#/sbin/rmmod
+#/sbin/depmod
+#%attr(0644,root,root) %{_mandir}/man5/*.5*
+#%attr(0644,root,root) %{_mandir}/man8/*.8*
 %doc NEWS README TODO COPYING
 
 %files libs
@@ -118,6 +111,11 @@ rm -rf $RPM_BUILD_ROOT
 /%{_libdir}/libkmod.so*
 
 %changelog
+* Mon Jan 16 2012 Kay Sievers <kay at redhat.com>
+- Update to version 4
+- set --with-rootprefix=
+- enable zlib and xz support
+
 * Thu Jan 05 2012 Jon Masters <jcm at jonmasters.org> - 3-1
 - Update to latest upstream (adds new depmod replacement utility)
 - For the moment, use the "kmod" utility to test the various functions
diff --git a/sources b/sources
index 6192bd1..8e810d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc0e69f75c2ac22c091f05e166e86c5d  kmod-3.tar.xz
+e14450a066a48accd0af1995b3c0232d  kmod-4.tar.xz