rpms/jabberd/FC-4 .cvsignore, 1.3, 1.4 jabberd, 1.5, 1.6 jabberd.spec, 1.9, 1.10 sources, 1.3, 1.4

[Adrian Reber (adrian)]

Author: adrian

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

Modified Files:
	.cvsignore jabberd jabberd.spec sources 
Log Message:
* Sun Nov 27 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.8
- %{_sysconfdir}/jabberd/server.pem was listed twice
- added /sbin/service dependency to %post, %postun and %preun
- jabber user is not deleted to avoid unowned files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 May 2005 07:08:32 -0000	1.3
+++ .cvsignore	28 Nov 2005 09:06:16 -0000	1.4
@@ -1 +1 @@
-jabberd-2.0s8.tar.gz
+jabberd-2.0s10.tar.gz


Index: jabberd
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/jabberd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jabberd	30 Mar 2005 19:46:31 -0000	1.5
+++ jabberd	28 Nov 2005 09:06:16 -0000	1.6
@@ -5,7 +5,7 @@
 #
 # processname: jabberd
 # description: jabberd is the next generation of the jabberd server
-# chkconfig: 2345 85 15
+# chkconfig: - 85 15
 #
 
 # source function library
@@ -145,7 +145,7 @@
 	condrestart)
         	for prog in ${progs}; do
 			if [ ! -f /var/lock/subsys/${prog} ]; then
-				exit -1
+				exit
 			fi
 		done
 		Stop


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/jabberd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jabberd.spec	12 May 2005 07:08:32 -0000	1.9
+++ jabberd.spec	28 Nov 2005 09:06:16 -0000	1.10
@@ -1,10 +1,10 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s8.5
+Release: 0.s10.8
 License: GPL
 Group: System Environment/Daemons
-Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s8.tar.gz
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s10.tar.gz
 Source1: jabberd
 Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
@@ -15,10 +15,10 @@
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{!?_without_mysql:BuildRequires: mysql-devel}
 %{!?_without_postgresql:BuildRequires: postgresql-devel}
-Requires(post): openssl chkconfig
+Requires(post): openssl chkconfig /sbin/service
 Requires(pre): shadow-utils
-Requires(preun): chkconfig shadow-utils
-Requires(postun): chkconfig
+Requires(preun): chkconfig shadow-utils /sbin/service
+Requires(postun): chkconfig /sbin/service
 
 %description
 The jabberd project aims to provide an open-source server implementation of the
@@ -33,7 +33,7 @@
 This packages defaults to use pam and the Berkeley DB.
 
 %prep
-%setup -q -n %{name}-%{version}s8
+%setup -q -n %{name}-%{version}s10
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -149,7 +149,8 @@
 if [ "$1" -eq "0" ]; then
 	/sbin/service %{name} stop > /dev/null 2>&1
 	/sbin/chkconfig --del %{name}
-	userdel jabber
+	#jabber user is not deleted to avoid unowned files
+	#userdel jabber
 	#should %{_var}/lib/jabberd be deleted???
 	#%{__rm} -rf %{_var}/lib/jabberd
 fi
@@ -164,7 +165,9 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
 %{_bindir}/*
 %attr(750, jabber, jabber) %dir %{sysconfdir}/
-%attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
+%attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*xml*
+%attr(750, jabber, jabber) %dir %{sysconfdir}/templates
+%attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/templates/*xml*
 %{_datadir}/man/man8/*
 %{_datadir}/%{name}/
 %config %{_initrddir}/%{name}
@@ -174,6 +177,17 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Sun Nov 27 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.8
+- %%{_sysconfdir}/jabberd/server.pem was listed twice
+- added /sbin/service dependency to %%post, %%postun and %%preun
+- jabber user is not deleted to avoid unowned files
+
+* Mon Oct 17 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.7
+- updated to 2.0-0.s10
+
+* Mon Aug 01 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s9.6
+- updated to 2.0-0.s9.6
+
 * Thu May 12 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s8.5
 - updated to 2.0-0.s8.5
 - using new location of make-dummy-cert


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 May 2005 07:08:32 -0000	1.3
+++ sources	28 Nov 2005 09:06:16 -0000	1.4
@@ -1 +1 @@
-96753c5e74676ace0841a4cee9f13fdb  jabberd-2.0s8.tar.gz
+e8df4a9a5680009071204d423cff2de0  jabberd-2.0s10.tar.gz