rpms/jabberd/FC-5 jabberd,1.7,1.8 jabberd.spec,1.13,1.14

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/jabberd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29236

Modified Files:
	jabberd jabberd.spec 
Log Message:
* Mon Aug 07 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.10
- changed pam file to use include
- added return value for status() function (bz #200996)



Index: jabberd
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-5/jabberd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jabberd	27 Nov 2005 12:41:32 -0000	1.7
+++ jabberd	7 Aug 2006 12:52:31 -0000	1.8
@@ -122,7 +122,9 @@
 {
         for prog in ${progs}; do
                 status ${prog}
+		retval=$?
         done
+	return ${retval}
 }
 
 case "$1" in


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-5/jabberd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jabberd.spec	3 Apr 2006 07:25:28 -0000	1.13
+++ jabberd.spec	7 Aug 2006 12:52:31 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s11.9%{?dist}
+Release: 0.s11.10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
@@ -82,9 +82,9 @@
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
 #%PAM-1.0
 auth       required     pam_nologin.so
-auth       required     pam_stack.so service=system-auth
-account    required     pam_stack.so service=system-auth
-session    required     pam_stack.so service=system-auth
+auth       include      system-auth
+account    include      system-auth
+session    include      system-auth
 END
 
 #default driver for storage
@@ -177,6 +177,10 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Mon Aug 07 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.10
+- changed pam file to use include
+- added return value for status() function (bz #200996)
+
 * Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
 - updated to 2.0-0.s11