rpms/dhcp-forwarder/devel dhcp-forwarder.spec,1.5,1.6

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/dhcp-forwarder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16904/dhcp-forwarder/devel

Modified Files:
	dhcp-forwarder.spec 
Log Message:
Mass letter "d" update, one or more apply :
- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs



Index: dhcp-forwarder.spec
===================================================================
RCS file: /cvs/extras/rpms/dhcp-forwarder/devel/dhcp-forwarder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhcp-forwarder.spec	2 Feb 2005 21:37:56 -0000	1.5
+++ dhcp-forwarder.spec	3 Mar 2005 20:20:14 -0000	1.6
@@ -24,18 +24,17 @@
 
 %{!?release_func:%define release_func() %1}
 
-Summary:	A DHCP relay agent
+Summary:	DHCP relay agent
 Name:		dhcp-forwarder
 Version:	0.7
 Release:	%release_func 1
-Epoch:		0
 License:	GPL
 Group:		System Environment/Daemons
 URL:		http://www.tu-chemnitz.de/~ensc/dhcp-fwd
 Source0:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2
 Source1:	http://www.tu-chemnitz.de/~ensc/dhcp-fwd/files/%name-%version.tar.bz2.asc
 BuildRoot:	%_tmppath/%name-%version-%release-root
-Requires:		init(dhcp-forwarder)
+Requires:	init(dhcp-forwarder)
 
 %{!?_without_dietlibc:BuildRequires:	dietlibc}
 
@@ -50,7 +49,7 @@
 Summary:		SysV initscripts for dhcp-forwarder
 Group:			System Environment/Base
 Provides:		init(dhcp-forwarder) = sysv
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(preun):	%name initscripts
 Requires(postun):	%name initscripts
 Requires(post):		/sbin/chkconfig
@@ -61,7 +60,7 @@
 Summary:		minit initscripts for dhcp-forwarder
 Group:			System Environment/Base
 Provides:		init(dhcp-forwarder) = minit
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
@@ -95,26 +94,20 @@
 with the minit initconcept.
 
 
-##---------------------------------------------
-
 
 %prep
 %setup -q
 
 
-##---------------------------------------------
-
 
 %build
 %configure \
 	--enable-release \
-        --with-initrddir=%_initrddir \
+	--with-initrddir=%_initrddir \
 	%{?_without_dietlibc:--disable-dietlibc}
 %__make %{?_smp_mflags}
 
 
-##---------------------------------------------
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -125,15 +118,11 @@
 %{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-##---------------------------------------------
-
 
 %check
 %__make check
 
 
-##---------------------------------------------
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -141,8 +130,8 @@
 
 %pre
 %groupadd -r %username &>/dev/null || :
-%useradd  -r -s /sbin/nologin -M -c 'DHCP Forwarder user'	\
-	  -d %homedir -g %username %username &>/dev/null || :
+%useradd  -r -s /sbin/nologin -M -c 'DHCP Forwarder user' \
+          -d %homedir -g %username %username &>/dev/null || :
 
 
 %postun
@@ -162,7 +151,7 @@
 fi
 
 %postun sysv
-test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
+test "$1" = "0" || %_initrddir/%service condrestart &>/dev/null
 
 
 %files