rpms/quagga/devel quagga.spec,1.53,1.54

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/quagga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8665

Modified Files:
	quagga.spec 
Log Message:
* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 0.99.12-3
- fixed #516005 - Errors installing quagga-0.99.11-2.fc11.i586 with --excludedocs
- fixed #522787 - quagga: build future versions without PAM



Index: quagga.spec
===================================================================
RCS file: /cvs/extras/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- quagga.spec	27 Jul 2009 02:38:58 -0000	1.53
+++ quagga.spec	14 Sep 2009 12:05:04 -0000	1.54
@@ -5,7 +5,7 @@
 %define		with_nssa	1
 %define		with_opaque_lsa 1
 %define		with_tcp_zebra	0
-%define		with_pam	1
+%define		with_pam	0
 %define		with_ipv6	1
 %define		with_ospfclient 1
 %define		with_ospfapi	1
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.12
-Release:    3%{?dist}
+Release:    4%{?dist}
 Epoch:      0
 License:	GPLv2+
 Group:      System Environment/Daemons
@@ -240,7 +240,9 @@ if getent passwd %quagga_user >/dev/null
 /sbin/chkconfig --add ospfd
 /sbin/chkconfig --add bgpd
 
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+if [ -f %{_infodir}/%{name}.inf* ]; then
+	/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 # Create dummy files if they don't exist so basic functions can be used.
 if [ ! -e %{_sysconfdir}/zebra.conf ]; then
@@ -269,14 +271,13 @@ if [ "$1" -ge  "1" ]; then
 %endif
 	/etc/rc.d/init.d/bgpd   condrestart >/dev/null 2>&1
 fi
-if [ "$1" = "0" ]; then
-	/sbin/install-info --delete %{_infodir}/quagga.info.gz %{_infodir}/dir
+if [ -f %{_infodir}/%{name}.inf* ]; then
+	/sbin/install-info --delete %{_infodir}/quagga.info %{_infodir}/dir || :
 fi
 
 
 %preun
 if [ "$1" = "0" ]; then
-	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
     /sbin/chkconfig --del zebra
 	/sbin/chkconfig --del ripd
 %if %with_ipv6
@@ -345,6 +346,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 14 2009 Jiri Skala <jskala at redhat.com> - 0.99.12-3
+- fixed #516005 - Errors installing quagga-0.99.11-2.fc11.i586 with --excludedocs
+- fixed #522787 - quagga: build future versions without PAM
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.99.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild