SPECS: cipe.spec - new-style bcond, cosmetics

[qboosh]

Author: qboosh                       Date: Tue Dec 13 19:13:55 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new-style bcond, cosmetics

---- Files affected:
SPECS:
   cipe.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/cipe.spec
diff -u SPECS/cipe.spec:1.46 SPECS/cipe.spec:1.47
--- SPECS/cipe.spec:1.46	Mon Dec 12 16:19:32 2005
+++ SPECS/cipe.spec	Tue Dec 13 20:13:49 2005
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _without_dist_kernel	- without kernel from distribution
+%bcond_without	dist_kernel	# without kernel from distribution
 #
 Summary:	CIPE - encrypted IP over UDP tunneling
 Summary(pl):	CIPE - szyfrowany tunel IP po UDP
@@ -24,7 +24,7 @@
 BuildRequires:	/usr/bin/openssl
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{!?_without_dist_kernel:BuildRequires:	kernel-headers}
+%{?with_dist_kernel:BuildRequires:	kernel-headers}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	rpmbuild(macros) >= 1.118
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,8 +48,8 @@
 Summary(pl):	PKCIPE - narzędzie do wykorzystania kluczy publicznych w CIPE
 Group:		Networking/Daemons
 Requires:	/usr/bin/openssl
-Requires:	%{name} = %{version}
-Obsoletes:	%{name}-pkcipe
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	cipe-pkcipe
 
 %description pkcipe-client
 CIPE (the name is shortened from *Crypto IP Encapsulation*) is a
@@ -71,7 +71,7 @@
 Summary:	The PKCIPE public key tool for CIPE - server side
 Summary(pl):	PKCIPE - narzędzie do wykorzystania kluczy publicznych w CIPE
 Group:		Networking/Daemons
-Requires:	%{name}-pkcipe-client = %{version}
+Requires:	%{name}-pkcipe-client = %{version}-%{release}
 Requires:	inetdaemon
 
 %description pkcipe-server
@@ -96,7 +96,7 @@
 Summary(pl):	Moduł jądra CIPE
 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
 
 %description -n kernel-cipe
@@ -104,21 +104,21 @@
 package for an encrypting IP tunnel device. This can be used to build
 encrypting routers for VPN (Virtual Private Networks) and similar
 applications. This package contains a kernel module compiled for
-%{_kernel_ver}%{smpstr}.
+%{_kernel_ver}.
 
 %description -n kernel-cipe -l pl
 CIPE (nazwa to skrót od *Crypto IP Encapsulation*) to pakiet do
 tworzenia szyfrowanych tuneli IP. Można je wykorzystać do budowania
 routerów szyfrujących w VPNach (Prywatnych Sieciach Wirtualnych) i
 podobnych zastosowaniach. Ten pakiet zawiera moduł kernela
-skompilowany dla %{_kernel_ver}%.
+skompilowany dla %{_kernel_ver}.
 
 %package -n kernel-smp-cipe
 Summary:	CIPE kernel module
 Summary(pl):	Moduł jądra CIPE
 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
 
 %description -n kernel-smp-cipe
@@ -126,14 +126,14 @@
 package for an encrypting IP tunnel device. This can be used to build
 encrypting routers for VPN (Virtual Private Networks) and similar
 applications. This package contains a kernel module compiled for
-%{_kernel_ver}%{smpstr}.
+%{_kernel_ver}smp.
 
 %description -n kernel-smp-cipe -l pl
 CIPE (nazwa to skrót od *Crypto IP Encapsulation*) to pakiet do
 tworzenia szyfrowanych tuneli IP. Można je wykorzystać do budowania
 routerów szyfrujących w VPNach (Prywatnych Sieciach Wirtualnych) i
 podobnych zastosowaniach. Ten pakiet zawiera moduł kernela
-skompilowany dla %{_kernel_ver}-smp.
+skompilowany dla %{_kernel_ver}smp.
 
 %prep
 %setup -q
@@ -161,8 +161,8 @@
 
 %{__make} modules
 
-mkdir modules/
-mv -f */cip?b.o modules/
+mkdir modules
+mv -f */cip?b.o modules
 
 %{__make} clean
 
@@ -239,10 +239,10 @@
 %files
 %defattr(644,root,root,755)
 %doc README* tcpdump.patch CHANGES samples
-%{_infodir}/*
 %attr(755,root,root) %{_sbindir}/ciped-*
 %dir %{_sysconfdir}/cipe
 %attr(755,root,root) %dir %{_var}/run/cipe
+%{_infodir}/*.info*
 
 %files pkcipe-client
 %defattr(644,root,root,755)
@@ -268,6 +268,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2005/12/13 19:13:49  qboosh
+- new-style bcond, cosmetics
+
 Revision 1.46  2005/12/12 15:19:32  glen
 - adapterized (sorted %verify flags)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cipe.spec?r1=1.46&r2=1.47&f=u