rpms/quagga/F-13 quagga.spec,1.56,1.57

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/quagga/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3195

Modified Files:
	quagga.spec 
Log Message:
* Fri Jun 11 2010 Jiri Skala <jskala at redhat.com> - 0.99.15-3
- fixes #602851 - ships PAM config file, even though PAM is disabled



Index: quagga.spec
===================================================================
RCS file: /cvs/extras/rpms/quagga/F-13/quagga.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- quagga.spec	27 Jan 2010 08:45:33 -0000	1.56
+++ quagga.spec	11 Jun 2010 08:44:58 -0000	1.57
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.15
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:	GPLv2+
 Group:      System Environment/Daemons
 Source0:	http://www.quagga.net/download/%{name}-%{version}.tar.gz
@@ -52,12 +52,18 @@ Requires:	net-snmp
 BuildRequires:	readline readline-devel ncurses ncurses-devel
 Requires:	ncurses
 %endif
-BuildRequires:	texinfo tetex autoconf pam-devel patch libcap-devel texi2html
+BuildRequires:	texinfo tetex autoconf patch libcap-devel texi2html
+
+%if %with_pam
+BuildRequires:  pam-devel
+Requires:       pam
+%endif
+
 %define __perl_requires %{SOURCE1}
 
 # Initscripts > 5.60 is required for IPv6 support
 Requires:	initscripts >= 5.60
-Requires:	ncurses pam
+Requires:	ncurses
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Provides:	routingdaemon = %{version}-%{release}
@@ -169,8 +175,11 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d,pam.d} \
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d} \
 	$RPM_BUILD_ROOT/var/log/quagga $RPM_BUILD_ROOT%{_infodir}
+%if %with_pam
+install -d $RPM_BUILD_ROOT/etc/pam.d
+%endif
 
 make install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -187,7 +196,9 @@ install %{zeb_rh_src}/ripngd.init $RPM_B
 install %{zeb_rh_src}/ospfd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd
 install %{zeb_rh_src}/ripd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd
 install -m644 %{zeb_rh_src}/quagga.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/quagga
+%if %with_pam
 install -m644 %{zeb_rh_src}/quagga.pam $RPM_BUILD_ROOT/etc/pam.d/quagga
+%endif
 install -m644 %{zeb_rh_src}/quagga.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/quagga
 install -d -m770  $RPM_BUILD_ROOT/var/run/quagga
 
@@ -329,7 +340,9 @@ rm -rf $RPM_BUILD_ROOT
 # noreplace not used due to smaple conf files
 %config /etc/quagga/[!v]*
 %attr(755,root,root) /etc/rc.d/init.d/*
+%if %with_pam
 %config(noreplace) /etc/pam.d/quagga
+%endif
 %config(noreplace) %attr(640,root,root) /etc/logrotate.d/quagga
 %config(noreplace) /etc/sysconfig/quagga                  
 
@@ -353,6 +366,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Jun 11 2010 Jiri Skala <jskala at redhat.com> - 0.99.15-3
+- fixes #602851 - ships PAM config file, even though PAM is disabled
+
 * Tue Jan 26 2010 Jiri Skala <jskala at redhat.com> - 0.99.15-2
 - changes in spec file and init scritps (#226352)