- adapterized (sorted %verify flags)

[packages/cipe.git] / cipe.spec

diff --git a/cipe.spec b/cipe.spec
index 54771e918b5abfc7ff78f924dcf2ffe7cb4c379c..024495f05938a856cc8be8a3e3393b0f460d63cb 100644 (file)
--- a/cipe.spec
+++ b/cipe.spec
@@ -19,16 +19,15 @@ Patch2:             %{name}-pk%{name}-real-peer.patch
 Patch3:                %{name}-get_fast_time.patch
 Patch4:                %{name}-alpha.patch
 URL:           http://sites.inka.de/bigred/devel/cipe.html
-%{!?_without_dist_kernel:BuildRequires: kernel-headers}
+BuildRequires: %{kgcc_package}
+BuildRequires: /usr/bin/openssl
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: openssl-devel >= 0.9.7
-BuildRequires: /usr/bin/openssl
-BuildRequires: %{kgcc_package}
-
+%{!?_without_dist_kernel:BuildRequires:        kernel-headers}
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: rpmbuild(macros) >= 1.118
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc
 %define                __cc            %{kgcc}
 
 %description
@@ -47,7 +46,7 @@ podobnych zastosowaniach.
 Summary:       The PKCIPE public key tool for CIPE
 Summary(pl):   PKCIPE - narzêdzie do wykorzystania kluczy publicznych w CIPE
 Group:         Networking/Daemons
-Prereq:                /usr/bin/openssl
+Requires:      /usr/bin/openssl
 Requires:      %{name} = %{version}
 Obsoletes:     %{name}-pkcipe
 
@@ -185,7 +184,6 @@ DEFS="-D__SMP__ -D__KERNEL_SMP=1" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_infodir}} \
        $RPM_BUILD_ROOT%{_sysconfdir}/cipe/pk \
        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc \
@@ -215,9 +213,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post pkcipe-server
 if [ -f /var/lock/subsys/rc-inetd ]; then
-        /etc/rc.d/init.d/rc-inetd reload 1>&2
+       /etc/rc.d/init.d/rc-inetd reload 1>&2
 else
-        echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
+       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
 fi
 
 %postun pkcipe-server
@@ -226,16 +224,16 @@ if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
 fi
 
 %post  -n kernel-cipe
-/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver} }%{_kernel_ver}
+%depmod %{_kernel_ver}
 
 %postun -n kernel-cipe
-/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver} }%{_kernel_ver}
+%depmod %{_kernel_ver}
 
 %post  -n kernel-smp-cipe
-/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver}smp }%{_kernel_ver}smp
+%depmod %{_kernel_ver}smp
 
 %postun -n kernel-smp-cipe
-/sbin/depmod -a %{!?_without_dist_kernel:-F /boot/System.map-%{_kernel_ver}smp }%{_kernel_ver}smp
+%depmod %{_kernel_ver}smp
 
 %files
 %defattr(644,root,root,755)
@@ -253,7 +251,7 @@ fi
 
 %files pkcipe-server
 %defattr(644,root,root,755)
-%attr(640,root,root) %config %verify(not size mtime md5) /etc/sysconfig/rc-inetd/pkcipe
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/pkcipe
 
 %files -n kernel-cipe
 %defattr(644,root,root,755)