2004-11-07 Paul Jakma <paul@dishone.st>

[mirror_frr.git] / redhat / quagga.spec.in

diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 11c6fe19646f271dee8f7b0ad93decdeab6928b1..ec7f206fc26f12607dc4583c0466ffc16bc217c4 100644 (file)
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -10,7 +10,7 @@
 %define                with_ipv6       1
 %define                with_ospfclient 1
 %define                with_ospfapi    1
-%define                with_irdp       0
+%define                with_irdp       1
 %define                with_isisd      0
 %define                with_shared     1
 %define                with_multipath  64
@@ -215,7 +215,8 @@ groupadd -r %vty_group 2> /dev/null || :
 zebra_spec_add_service ()
 {
   # Add port /etc/services entry if it isn't already there 
-  if [ -f /etc/services ] && ! grep -q "^$1[^a-zA-Z0-9]" /etc/services ; then
+  if [ -f /etc/services ] && \
+      ! %__sed -e 's/#.*$//' /etc/services | %__grep -wq $1 ; then
     echo "$1           $2                      # $3"  >> /etc/services
   fi
 }
@@ -307,6 +308,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with_isisd}
 %{_sbindir}/isisd
 %endif
+%dir %attr(755,root,root) %{_libdir}
 %if %{with_shared}
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so.*
@@ -329,16 +331,26 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with_ospfclient}
 %{_sbindir}/ospfclient
 %endif
-%dir %{_libdir}/*.a
-%dir %{_libdir}/*.la
-%dir %{_includedir}/%name/*.h
-%dir %{_includedir}/%name/ospfd/*.h
+%{_libdir}/*.a
+%{_libdir}/*.la
+%dir %attr(755,root,root) %{_includedir}/%{name}
+%{_includedir}/%name/*.h
+%dir %attr(755,root,root) %{_includedir}/%{name}/ospfd
+%{_includedir}/%name/ospfd/*.h
 %if %{with_ospfapi}
-%dir %{_includedir}/%name/ospfapi/*.h
+%dir %attr(755,root,root) %{_includedir}/%{name}/ospfapi
+%{_includedir}/%name/ospfapi/*.h
 %endif
 
 %changelog
 %changelog
+* Sat Oct 23 2004 Paul Jakma <paul@dishone.st>
+- Update to 0.97.2
+
+* Sat Oct 23 2004 Andrew J. Schorr <aschorr@telemetry-investments.com>
+- Make directories be owned by the packages concerned
+- Update logrotate scripts to use correct path to killall and use pid files
+
 * Fri Oct 08 2004 Paul Jakma <paul@dishone.st>
 - Update to 0.97.0