SPECS (AC-branch): quagga.spec - adapter

[glen]

Author: glen                         Date: Sat Apr 15 14:02:51 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- adapter

---- Files affected:
SPECS:
   quagga.spec (1.25.2.4 -> 1.25.2.5) 

---- Diffs:

================================================================
Index: SPECS/quagga.spec
diff -u SPECS/quagga.spec:1.25.2.4 SPECS/quagga.spec:1.25.2.5
--- SPECS/quagga.spec:1.25.2.4	Sun Feb  5 12:04:24 2006
+++ SPECS/quagga.spec	Sat Apr 15 16:02:46 2006
@@ -45,16 +45,16 @@
 BuildRequires:	readline-devel >= 4.1
 BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	texinfo
-PreReq:		rc-scripts
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
 Requires(post):	/bin/hostname
 Requires(post):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	rc-scripts
 Provides:	group(quagga)
 Provides:	group(quaggavty)
 Provides:	routingdaemon
@@ -62,8 +62,8 @@
 Obsoletes:	bird
 Obsoletes:	gated
 Obsoletes:	mrt
-Obsoletes:	zebra-xs26
 Obsoletes:	quagga
+Obsoletes:	zebra-xs26
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/%{name}
@@ -118,8 +118,8 @@
 Summary:	IPv6 OSPF routing daemon
 Summary(pl):	Demon routingu OSPF w sieciach IPv6
 Group:		Networking/Daemons
-Requires:	%{name} = %{version}-%{release}
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	zebra-xs26-ospf6d
 
 %description ospf6d
@@ -145,8 +145,8 @@
 Summary:	IPv6 RIP routing daemon
 Summary(pl):	Demon routingu RIP w sieciach IPv6
 Group:		Networking/Daemons
-Requires:	%{name} = %{version}-%{release}
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	zebra-xs26-ripngd
 
 %description ripngd
@@ -478,6 +478,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25.2.5  2006/04/15 14:02:46  glen
+- adapter
+
 Revision 1.25.2.4  2006/02/05 11:04:24  arekm
 - rel 2; updated initscripts; fixed rights to /var/log/quagga dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/quagga.spec?r1=1.25.2.4&r2=1.25.2.5&f=u