X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=capsel.spec;h=0f8c068a76da554e6a8f4046e01f1c0439f4e5a4;hb=9f717dd18dfe0a979cbfd97ef528e1d2120a1c24;hp=966a182f612fae9d8dfe19ee613b1e39ec71fe44;hpb=a9f56087170dc8ab9470e89ddd034c9fb9cd2c56;p=packages%2Fcapsel.git

diff --git a/capsel.spec b/capsel.spec
index 966a182..0f8c068 100644
--- a/capsel.spec
+++ b/capsel.spec
@@ -1,24 +1,26 @@
 #
+# Conditional build:
 # _without_dist_kernel - without distribution kernel
 #
-%define		_rel		1
-%define		_pre		pre5
 %define		_orig_name	capsel
+%define		_pre		rc1
 
 Summary:	Capsel - supports Linux-Privs security model
 Summary(pl):	Capsel - obs³uga modelu bezpieczeñstwa Linux-Privs
 Name:		%{_orig_name}
-Version:	1.9.99
+Version:	2.0
+%define	_rel	8
 Release:	%{_pre}.%{_rel}
 Group:		Base/Kernel
 License:	GPL v2
 Source0:	http://cliph.linux.pl/capsel/capsel-%{version}%{_pre}.tar.gz
 Source1:	%{name}.init
-Patch0:		%{name}-license.patch
+Patch0:		%{name}-2.0rc2.diff
+Patch1:		%{name}-no_kernel_smp.patch
+Patch2:		%{name}-include-fix.patch
 URL:		http://cliph.linux.pl/capsel/
 %{!?_without_dist_kernel:BuildRequires: kernel-headers}
 BuildRequires:	%{kgcc_package}
-Prereq:		/sbin/depmod
 %{!?_without_dist_kernel:Requires:	kernel(capsel)}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,6 +39,7 @@ Summary(pl):	Capsel - obs
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{!?_without_dist_kernel:%requires_releq_kernel_up}
+Requires(post,postun):	/sbin/depmod
 Provides:	kernel(capsel)
 
 %description -n kernel-misc-capsel
@@ -50,8 +53,8 @@ Summary:	Capsel - supports Linux-Privs security model
 Summary(pl):	Capsel - obs³uga modelu bezpieczeñstwa Linux-Privs
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Prereq:		/sbin/depmod
 %{!?_without_dist_kernel:%requires_releq_kernel_smp}
+Requires(post,postun):	/sbin/depmod
 Provides:	kernel(capsel)
 
 %description -n kernel-smp-misc-capsel
@@ -63,6 +66,8 @@ Capsel - modu
 %prep
 %setup -q -n %{name}-%{version}%{_pre}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 mkdir bin/
@@ -87,7 +92,7 @@ install bin/capsel.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/capsel.o
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
 install bin/capselsmp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/capsel.o
 
-install %{SOURCE1}	$RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/capsel
+install %{SOURCE1}	$RPM_BUILD_ROOT//etc/rc.d/init.d/capsel
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,24 +114,24 @@ if [ "$1" = "0" ]; then
 fi
 
 %post	-n kernel-misc-capsel
-/sbin/depmod -a
+/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver} }%{_kernel_ver}
 
 %postun	-n kernel-misc-capsel
-/sbin/depmod -a
+/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver} }%{_kernel_ver}
 
 %post	-n kernel-smp-misc-capsel
-/sbin/depmod -a
+/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver}smp }%{_kernel_ver}smp
 
 %postun	-n kernel-smp-misc-capsel
-/sbin/depmod -a
+/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver}smp }%{_kernel_ver}smp
 
 %files
 %defattr(644,root,root,755)
-%doc README CAPABILITIES ChangeLog TODO misc/* scripts/*
+%doc README CAPABILITIES ChangeLog TODO misc scripts conf
 %attr(755,root,root) /sbin/*
 %dir %attr(750,root,root) %{_sysconfdir}/capsel
-%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/capsel
-%attr(750,root,root) %config(noreplace) %{_sysconfdir}/capsel/*
+%attr(755,root,root) /etc/rc.d/init.d/capsel
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/capsel/*
 
 %files -n kernel-misc-capsel
 %defattr(644,root,root,755)