From ce23519c41b1b1214a7ab3529f2cc09b023a198f Mon Sep 17 00:00:00 2001
From: jvdias <jvdias@fedoraproject.org>
Date: Mon, 18 Jul 2005 17:50:53 +0000
Subject: [PATCH] Upgrade to upstream version 0.8; fix bug 159005

---
 radvd.spec | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/radvd.spec b/radvd.spec
index 67e425e..2ccf721 100644
--- a/radvd.spec
+++ b/radvd.spec
@@ -2,9 +2,9 @@
 %define RADVD_UID 75
 Summary:   A Router Advertisement daemon
 Name:      radvd
-Version:   0.7.3
-Release:   1_FC4
-License:   BSD
+Version:   0.8
+Release:   1.FC5
+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
@@ -25,13 +25,8 @@ services.
 %setup
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE"
-export LDFLAGS='-Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen'
-%configure --with-pidfile=/var/run/radvd/radvd.pid
-make 
-# make %{?_smp_mflags} 
-# Parallel builds fail because seds that transform y.tab.x into
-# scanner/gram.x are not executed before compile of scanner/gram.x
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen' ./configure --with-pidfile=/var/run/radvd/radvd.pid
+make %{?_smp_mflags} 
 
 %install
 [ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -39,7 +34,8 @@ make
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p $RPM_BUILD_ROOT%{initdir}
 mkdir -p $RPM_BUILD_ROOT/var/run/radvd
-install -m 644 radvd.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/radvd.conf
+
+install -m 644 redhat/radvd.conf.empty $RPM_BUILD_ROOT%{_sysconfdir}/radvd.conf
 install -m 755 redhat/radvd.init $RPM_BUILD_ROOT%{initdir}/radvd
 install -m 644 redhat/radvd.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/radvd
 
@@ -74,11 +70,19 @@ fi
 %config(noreplace) /etc/sysconfig/radvd
 %config %{initdir}/radvd
 %dir %attr(-,radvd,radvd) /var/run/radvd/
+%doc radvd.conf.example
 %{_mandir}/*/*
 %{_sbindir}/radvd
 %{_sbindir}/radvdump
 
 %changelog
+* Mon Jul 18 2005 Jason Vas Dias <jvdias@redhat.com> 0.8-1.FC5
+- Upgrade to upstream version 0.8
+
+* Fri Jul  8 2005 Pekka Savola <pekkas@netcore.fi> 0.8-1
+- 0.8.
+- Ship the example config file as %%doc (Red Hat's #159005)
+
 * Fri Feb 25 2005 Jason Vas Dias <jvdias@redhat.com> 0.7.3-1_FC4
 - make version compare > that of FC3