From c708ddb5edd98520579865639001b32b22e6f4d7 Mon Sep 17 00:00:00 2001
From: Martin Bacovsky <mbacovsk@fedoraproject.org>
Date: Thu, 15 Feb 2007 07:44:58 +0000
Subject: [PATCH] - specfile cleanup for review

---
 radvd.spec | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/radvd.spec b/radvd.spec
index a889822..f93ad4c 100644
--- a/radvd.spec
+++ b/radvd.spec
@@ -2,17 +2,21 @@
 #%(if test -d /etc/init.d/. ; then echo /etc/init.d ; else echo /etc/rc.d/init.d ; fi)
 
 %define RADVD_UID 75
-Summary:   A Router Advertisement daemon
-Name:      radvd
-Version:   1.0
-Release:   2%{?dist}
+Summary:    A Router Advertisement daemon
+Name:       radvd
+Version:    1.0
+Release:    3%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
-License:   BSD-style
-Group:     System Environment/Daemons
-Source:    http://www.litech.org/radvd/radvd-%{version}.tar.gz
-PreReq:    chkconfig, /usr/sbin/useradd, /sbin/service, initscripts
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: flex, byacc
+License:    BSD-style
+Group:      System Environment/Daemons
+Source:     http://www.litech.org/radvd/dist/%{name}-%{version}.tar.gz
+URL:        http://www.litech.org/radvd/
+Requires(postun):   chkconfig, /usr/sbin/userdel, initscripts
+Requires(preun):    chkconfig, initscripts
+Requires(post):     chkconfig
+Requires(pre):      /usr/sbin/useradd
+BuildRequires:      flex, byacc
+BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router
@@ -26,7 +30,7 @@ Install radvd if you are setting up IPv6 network and/or Mobile IPv6
 services.
 
 %prep
-%setup
+%setup -q
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" 
@@ -41,7 +45,8 @@ make
 %install
 [ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p $RPM_BUILD_ROOT%{initdir}
 mkdir -p $RPM_BUILD_ROOT/var/run/radvd
@@ -75,11 +80,11 @@ fi
 /usr/sbin/useradd -c "radvd user" -r -M -s /sbin/nologin -u %{RADVD_UID} -d / radvd 2>/dev/null || :
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYRIGHT README CHANGES INTRO.html TODO
 %config(noreplace) %{_sysconfdir}/radvd.conf
 %config(noreplace) /etc/sysconfig/radvd
-%config %{initdir}/radvd
+%{initdir}/radvd
 %dir %attr(-,radvd,radvd) /var/run/radvd/
 %doc radvd.conf.example
 %{_mandir}/*/*
@@ -87,6 +92,9 @@ fi
 %{_sbindir}/radvdump
 
 %changelog
+* Wed Feb 14 2007 Martin Bacovsky <mbacovsk@redhat.com> - 1.0-3.fc7
+- specfile cleanup for review
+
 * Thu Feb  1 2007 Martin Bacovsky <mbacovsk@redhat.com> - 1.0-2.fc7
 - linking with -pie flag turned on again
 
@@ -235,8 +243,8 @@ the like, really).
 - Create a single package(source) for glibc21 and glibc22 (automatic
 Requires can handle this just fine).
 - use %%{_mandir} and friends
-- add more flesh to %doc
-- streamline %config file %attrs
+- add more flesh to %%doc
+- streamline %%config file %%attrs
 - streamline init.d file a bit:
    * add a default chkconfig: (default to disable for security etc. reasons; 
      also, the default config isn't generic enough..)