- adapterized (sorted %verify flags)

[packages/capsel.git] / capsel.spec

diff --git a/capsel.spec b/capsel.spec
index b37aa3a8a2d833587d5ffa706880e6daccc2f9c0..56dc6e032eca80d71d5fdcc0e554b9a5d7242a0a 100644 (file)
--- a/capsel.spec
+++ b/capsel.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-# _without_dist_kernel - without distribution kernel
+%bcond_without dist_kernel     # without distribution kernel
 #
 %define                _orig_name      capsel
 %define                _pre            rc1
@@ -9,7 +9,7 @@ Summary:        Capsel - supports Linux-Privs security model
 Summary(pl):   Capsel - obs³uga modelu bezpieczeñstwa Linux-Privs
 Name:          %{_orig_name}
 Version:       2.0
-%define        _rel    8
+%define        _rel    11
 Release:       %{_pre}.%{_rel}
 Group:         Base/Kernel
 License:       GPL v2
@@ -21,11 +21,11 @@ Patch1:             %{name}-no_kernel_smp.patch
 Patch2:                %{name}-include-fix.patch
 URL:           http://cliph.linux.pl/capsel/
 BuildRequires: %{kgcc_package}
+%{?with_dist_kernel:BuildRequires:     kernel-headers}
 BuildRequires: rpmbuild(macros) >= 1.118
-%{!?_without_dist_kernel:BuildRequires:        kernel-headers}
-PreReq:                rc-scripts
+Requires:      rc-scripts
 Requires(post,preun):  /sbin/chkconfig
-%{!?_without_dist_kernel:Requires:     kernel(capsel)}
+%{?with_dist_kernel:Requires:  kernel(capsel)}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +42,7 @@ 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
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun): /sbin/depmod
 Provides:      kernel(capsel)
 
@@ -57,7 +57,7 @@ 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
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun): /sbin/depmod
 Provides:      kernel(capsel)
 
@@ -134,7 +134,7 @@ fi
 %attr(755,root,root) /sbin/*
 %dir %attr(750,root,root) %{_sysconfdir}/capsel
 %attr(754,root,root) /etc/rc.d/init.d/capsel
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/capsel/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/capsel/*
 
 %files -n kernel-misc-capsel
 %defattr(644,root,root,755)