- updated to 14; static is no more

[packages/kmod.git] / kmod.spec

diff --git a/kmod.spec b/kmod.spec
index 7eef5cd73a367ff2a47f42822695dcd4acb20b4f..38ed0e5d134cd5202d6c42f194e90662ba5bab1e 100644 (file)
--- a/kmod.spec
+++ b/kmod.spec
@@ -1,34 +1,37 @@
-# TODO:
-# - implement /etc/modprobe.d/kver/ support (just as in our module-init-tools)
-%bcond_without tests
+# Conditional build:
+%bcond_without tests   # perform "make check" (init_module seems to require root for mkdir)
+#
 Summary:       Linux kernel module handling
 Summary(pl.UTF-8):     Obsługa modułów jądra Linuksa
 Name:          kmod
-Version:       5
+Version:       14
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
-Source0:       http://packages.profusion.mobi/kmod/%{name}-%{version}.tar.xz
-# Source0-md5: b271c2ec54aba1c67bda63c8579d8c15
+Source0:       ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz
+# Source0-md5: 38009d0d6f10678a3ec22ccd29210d13
 Source1:       %{name}-blacklist
 Source2:       %{name}-usb
-URL:           http://git.profusion.mobi/cgit.cgi/kmod.git/
+Patch0:                %{name}-modprobe.d-kver.patch
+URL:           http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.11
 BuildRequires: gtk-doc >= 1.14
 BuildRequires: libtool >= 2:2.0
 BuildRequires: pkgconfig
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 BuildRequires: xz-devel >= 1:4.99
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{version}-%{release}
 # won't work on older kernels as these do not provide require information in /sys
 Requires:      uname(release) >= 2.6.21
 Provides:      virtual(module-tools)
-Obsoletes:     module-init-tools
+Provides:      module-init-tools = 4.0
+Obsoletes:     module-init-tools < 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _exec_prefix    /
-%define                _bindir         %{_sbindir}
+%define                _bindir         /sbin
 
 %description
 kmod is a set of tools to handle common tasks with Linux kernel
@@ -72,6 +75,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki %{name}
 License:       LGPL v2.1+
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
+Obsoletes:     kmod-libs-static
 
 %description devel
 Header files for %{name} library.
@@ -81,6 +85,10 @@ Pliki nagłówkowe biblioteki %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
+
+# requires root to work
+sed -i -e 's# testsuite/test-modprobe # #g' Makefile.am
 
 %build
 %{__libtoolize}
@@ -90,6 +98,7 @@ Pliki nagłówkowe biblioteki %{name}.
 %{__automake}
 %configure \
        --disable-silent-rules \
+       --with-rootlibdir=/%{_lib} \
        --with-xz \
        --with-zlib
 %{__make}
@@ -106,9 +115,10 @@ install -d $RPM_BUILD_ROOT/etc/modprobe.d
 
 # install symlinks
 for prog in lsmod rmmod insmod modinfo modprobe depmod; do
-       ln -s kmod $RPM_BUILD_ROOT%{_sbindir}/$prog
+       ln -s kmod $RPM_BUILD_ROOT%{_bindir}/$prog
 done
 
+# obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libkmod.la
 
 :> $RPM_BUILD_ROOT/etc/modprobe.d/modprobe.conf
@@ -130,13 +140,13 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/modprobe.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/usb.conf
 
-%attr(755,root,root) %{_sbindir}/kmod
-%attr(755,root,root) %{_sbindir}/lsmod
-%attr(755,root,root) %{_sbindir}/rmmod
-%attr(755,root,root) %{_sbindir}/insmod
-%attr(755,root,root) %{_sbindir}/modinfo
-%attr(755,root,root) %{_sbindir}/modprobe
-%attr(755,root,root) %{_sbindir}/depmod
+%attr(755,root,root) %{_bindir}/kmod
+%attr(755,root,root) %{_bindir}/lsmod
+%attr(755,root,root) %{_bindir}/rmmod
+%attr(755,root,root) %{_bindir}/insmod
+%attr(755,root,root) %{_bindir}/modinfo
+%attr(755,root,root) %{_bindir}/modprobe
+%attr(755,root,root) %{_bindir}/depmod
 
 %{_mandir}/man5/depmod.d.5*
 %{_mandir}/man5/modprobe.d.5*
@@ -152,8 +162,8 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %doc libkmod/README
-%attr(755,root,root) %{_libdir}/libkmod.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmod.so.2
+%attr(755,root,root) /%{_lib}/libkmod.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libkmod.so.2
 
 %files devel
 %defattr(644,root,root,755)