From 80eed1d5c9869f375e24c45f00b10a53cc5fdc28 Mon Sep 17 00:00:00 2001
From: fenlason <fenlason@fedoraproject.org>
Date: Mon, 17 Jan 2005 19:36:43 +0000
Subject: [PATCH] Upgrade to 0.98.0 Closes bz#143796 Closes bz#140894

---
 .cvsignore  |  6 +-----
 quagga.spec | 30 +++++++++++++++++++++++-------
 sources     |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index dc06c5a..935b694 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1 @@
-quagga-0.96.5.tar.gz
-quagga-0.97.0.tar.gz
-quagga-0.97.1.tar.gz
-quagga-0.97.2.tar.gz
-quagga-0.97.3.tar.gz
+quagga-0.98.0.tar.gz
diff --git a/quagga.spec b/quagga.spec
index 2bd95f9..1fedaf7 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -31,8 +31,8 @@
 
 Summary: Routing daemon
 Name:		quagga
-Version:	0.97.3
-Release: 3
+Version:	0.98.0
+Release: 2
 Epoch: 0
 License:	GPL
 Group: System Environment/Daemons
@@ -142,7 +142,7 @@ CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
 	--enable-vty-group=%vty_group \
 %endif
 %if %with_rtadv
-	--with-rtadv \
+	--enable-rtadv \
 %endif
 --with-cflags="-O2" \
 --enable-netlink
@@ -304,10 +304,12 @@ rm -rf $RPM_BUILD_ROOT
 %if %with_vtysh
 %{_bindir}/*
 %endif
+%dir %{_libdir}
+%{_libdir}/*.so*
 %config /etc/quagga/[!v]*
 %config /etc/rc.d/init.d/*
 %config(noreplace) /etc/pam.d/quagga
-%config(noreplace) %attr(640,root,root) /etc/logrotate.d/*
+%config(noreplace) %attr(640,root,root) /etc/logrotate.d/quagga
 %config(noreplace) /etc/sysconfig/quagga                  
 
 
@@ -317,15 +319,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-%dir %{_libdir}/*
+%{_libdir}/*.a
+%{_libdir}/*.la
 %dir %{_includedir}/quagga
 %{_includedir}/quagga/*.h
-%dir %{_includedir}/quagga/ospfd/*
+%dir %{_includedir}/quagga/ospfd
+%{_includedir}/quagga/ospfd/*.h
 %if %with_ospfapi
-%dir %{_includedir}/quagga/ospfapi/*
+%dir %{_includedir}/quagga/ospfapi
+%{_includedir}/quagga/ospfapi/*.h
 %endif
 
 %changelog
+* Sun Jan 16 2005 Jay Fenlason <fenlason@redhat.com> 0.98.0-2
+- New upstream version.  This fixes bz#143796
+- --with-rtadv needs to be --enable-rtadv according to configure.
+  (but it was enabled by default, so this is a cosmetic change only)
+  Change /etc/logrotate.d/* to /etc/logrotate.d/quagga in this spec file.
+- Modify this spec file to move the .so files to the base package
+  and close bz#140894
+- Modify this spec file to separate out %{_includedir}/quagga/ospfd
+  from .../*.h and %{_includedir}/quagga/ospfapi from .../*.h
+  Rpmbuild probably shouldn't allow %dir of a plain file.
+
 * Wed Jan 12 2005 Tim Waugh <twaugh@redhat.com> 0.97.3-3
 - Rebuilt for new readline.
 - Don't explicitly require readline.  The correct dependency is automatically
diff --git a/sources b/sources
index 6f613d2..abd9e56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51d1020edcba2c8b334261c766142574  quagga-0.97.3.tar.gz
+938cdf15f0ff79f797fc08316b94f449  quagga-0.98.0.tar.gz