- use standard scheme for LKMs

Changed files:
    bindprivs.spec -> 1.9

diff --git a/bindprivs.spec b/bindprivs.spec
index fc796168e8277734695d0de368221521fc620e4c..40bbdd73ad8632c69bce07244263b01914776059 100644 (file)
--- a/bindprivs.spec
+++ b/bindprivs.spec
@@ -1,7 +1,8 @@
 #
-# TODO: use standard scheme for kernel module
+# Conditional build:
+# _without_dist_kernel - without distribution kernel
 #
-Summary:       Little silly kernel module can be used to restrict virtual hosts
+Summary:       Little silly kernel module and utility to restrict virtual hosts
 Summary(pl):   Proste narzêdzie do ustawiania restrykcji u¿ywania wirtualnych hostów
 Name:          bindprivs
 Version:       0.6
@@ -10,28 +11,74 @@ License:    GPL
 Group:         Networking/Utilities
 Source0:       ftp://bzium.eu.org/pub/%{name}-%{version}.tar.gz
 # Source0-md5: 0846e1094480728440ec46d273cc0815
+%{!?_without_dist_kernel:BuildRequires: kernel-headers}
+BuildRequires:  %{kgcc_package}
+BuildRequires:  rpmbuild(macros) >= 1.118
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-This little silly kernel module can be used to restrict virtual host
-to some particular users. Read bindprivs.conf(5) and bpset(8) for more
-details.
+bindprivs is a little silly kernel module can be used to restrict
+virtual host to some particular users. Read bindprivs.conf(5) and
+bpset(8) for more details.
 
 %description -l pl
-To prosty modu³ j±dra s³u¿±cy do ograniczenia u¿ywania wirtualnych
-hostów dla poszczególnych u¿ytkowników. Informacje na temat u¿ywania
-go mo¿na znale¼æ w bindprivs.conf(5) oraz bpset(8).
+bindprivs to prosty modu³ j±dra s³u¿±cy do ograniczenia u¿ywania
+wirtualnych hostów dla poszczególnych u¿ytkowników. Informacje na
+temat u¿ywania go mo¿na znale¼æ w bindprivs.conf(5) oraz bpset(8).
+
+%package -n kernel-misc-bindprivs
+Summary:       bindprivs Linux kernel module
+Summary(pl):   Modu³ j±dra Linuksa bindprivs
+Group:         Base/Kernel
+%{!?_without_dist_kernel:%requires_releq_kernel_up}
+Requires(post,postun): /sbin/depmod
+
+%description -n kernel-misc-bindprivs
+bindprivs Linux kernel module - a little silly kernel module which can
+be used to restrict virtual host to some particular users.
+
+%description -n kernel-misc-bindprivs -l pl
+Modu³ j±dra Linuksa bindprivs - prosty modu³ j±dra s³u¿±cy do
+ograniczenia u¿ywania wirtualnych hostów dla poszczególnych
+u¿ytkowników.
+
+%package -n kernel-smp-misc-bindprivs
+Summary:       bindprivs Linux SMP kernel module
+Summary(pl):   Modu³ j±dra Linuksa SMP bindprivs
+Group:         Base/Kernel
+%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+Requires(post,postun): /sbin/depmod
+
+%description -n kernel-smp-misc-bindprivs
+bindprivs Linux SMP kernel module - a little silly kernel module which
+can be used to restrict virtual host to some particular users.
+
+%description -n kernel-smp-misc-bindprivs -l pl
+Modu³ j±dra Linuksa SMP bindprivs - prosty modu³ j±dra s³u¿±cy do
+ograniczenia u¿ywania wirtualnych hostów dla poszczególnych
+u¿ytkowników.
 
 %prep
 %setup -q
 
 %build
-%{__make} \
+%{__make} bindprivs.o \
+       CC="%{kgcc}" \
+       CFLAGS="%{rpmcflags} -fomit-frame-pointer -Wall -D__SMP__"
+mv -f bindprivs.o bindprivs-smp.o
+
+%{__make} bindprivs.o \
+       CC="%{kgcc}" \
+       CFLAGS="%{rpmcflags} -fomit-frame-pointer -Wall"
+
+%{__make} bpset \
+       CC="%{__cc}" \
        CFLAGS="%{rpmcflags} -Wall"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{5,8},%{_libdir}/bindprivs,%{_sysconfdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{5,8},%{_sysconfdir}} \
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/bindprivs.conf << EOF
 # Sample configuration
@@ -49,7 +96,7 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/bindprivs.conf << EOF
 EOF
 
 cat > $RPM_BUILD_ROOT%{_bindir}/bpload << EOF
-/sbin/insmod /usr/lib/bindprivs/bindprivs.o
+/sbin/insmod bindprivs
 EOF
 
 cat > $RPM_BUILD_ROOT%{_bindir}/bpremove << EOF
@@ -57,18 +104,39 @@ bpset -u
 /sbin/rmmod bindprivs
 EOF
 
+install bindprivs-smp.o        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/bindprivs.o
+install bindprivs.o    $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+
 install bpset          $RPM_BUILD_ROOT%{_bindir}
-install bindprivs.o    $RPM_BUILD_ROOT%{_libdir}/bindprivs
 install bindprivs.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install bpset.8                $RPM_BUILD_ROOT%{_mandir}/man8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -n kernel-misc-bindprivs
+%depmod %{_kernel_ver}
+
+%postun        -n kernel-misc-bindprivs
+%depmod %{_kernel_ver}
+
+%post  -n kernel-smp-misc-bindprivs
+%depmod %{_kernel_ver}smp
+
+%postun        -n kernel-smp-misc-bindprivs
+%depmod %{_kernel_ver}smp
+
 %files
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_bindir}/bp*
-%{_libdir}/bindprivs
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/bindprivs.conf
 %{_mandir}/man?/*
+
+%files -n kernel-misc-bindprivs
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/bindprivs.o*
+
+%files -n kernel-smp-misc-bindprivs
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/misc/bindprivs.o*