[jabberd] - ported spec changes from f14 branch to devel branch

[Adrian Reber]

commit 224ec2f7e56d34684cd7c530dae3955b2f7195ed
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Jan 5 22:01:17 2011 +0100

    - ported spec changes from f14 branch to devel branch

 jabberd => jabberd.init |    0
 jabberd.spec            |   19 ++++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/jabberd b/jabberd.init
similarity index 100%
rename from jabberd
rename to jabberd.init
diff --git a/jabberd.spec b/jabberd.spec
index 9b47a9d..46a0f5b 100644
--- a/jabberd.spec
+++ b/jabberd.spec
@@ -1,11 +1,11 @@
 Summary:        OpenSource server implementation of the Jabber protocols
 Name:           jabberd
 Version:        2.2.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 Source0:        http://ftp.xiaoka.com/jabberd2/releases/jabberd-%{version}.tar.bz2
-Source1:        jabberd
+Source1:        jabberd.init
 Source2:        jabberd.sysconfig
 Source3:        jabberd.pam
 URL:            http://codex.xiaoka.com/wiki/jabberd2:start
@@ -31,11 +31,11 @@ the Jabber protocols for instant messaging and XML routing. The goal of this
 project is to provide a scalable, reliable, efficient and extensible server
 that provides a complete set of features and is up to date with the latest
 protocol revisions.
-jabberd 2 is the next generation of the jabberd server. It has been
+jabberd2 is the next generation of the jabberd server. It has been
 rewritten from the ground up to be scalable, architecturally sound, and to
 support the latest protocol extensions coming out of the JSF.
 
-This packages defaults to use pam and sqlite.
+This package defaults to use pam and sqlite.
 
 %prep
 %setup -q
@@ -77,7 +77,7 @@ iconv -f ISO88591 -t UTF8 < ChangeLog > ChangeLog.utf8 && \
 touch -r ChangeLog ChangeLog.utf8 && \
 mv ChangeLog.utf8 ChangeLog
 
-install -dpm 644 $RPM_BUILD_ROOT/%{_var}/lib/%{name}/{log,pid,db}
+install -dpm 700 $RPM_BUILD_ROOT/%{_var}/lib/%{name}/{log,pid,db}
 install -dpm 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
 install -Dpm 644 tools/pam_jabberd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name}
 
@@ -118,6 +118,8 @@ sed -i -e ':a;N;$!ba' \
             -e 's,<module>mysql</module>,<module>pam</module>,g' \
             -e "s,register-enable='true'>,realm='' require-starttls='true' pemfile='/etc/%{name}/server.pem'>,g" \
                 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/c2s.xml
+#ghost file
+touch $RPM_BUILD_ROOT%{_sysconfdir}/jabberd/server.pem
 
 # we have our own start script
 rm -f $RPM_BUILD_ROOT%{_bindir}/jabberd
@@ -180,6 +182,7 @@ fi
 %{_libdir}/%{name}/
 %attr(750, jabber, jabber) %dir %{_sysconfdir}/%{name}
 %attr(750, jabber, jabber) %dir %{_sysconfdir}/%{name}/templates
+%config(noreplace) %{_sysconfdir}/%{name}/server.pem
 %attr(640, jabber, jabber) %config(noreplace) %{_sysconfdir}/%{name}/*xml*
 %attr(640, jabber, jabber) %config(noreplace) %{_sysconfdir}/%{name}/templates/*xml*
 %dir %{_datadir}/%{name}/
@@ -190,10 +193,12 @@ fi
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%attr(755, jabber, jabber) %{_var}/lib/%{name}
-%attr(640, jabber, jabber) %ghost %{_sysconfdir}/%{name}/server.pem
+%attr(700, jabber, jabber) %{_var}/lib/%{name}
 
 %changelog
+* Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-4
+- ported spec changes from f14 branch to devel branch
+
 * Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-3
 - fix "jabberd spec file puts server.pem in /etc instead of /etc/jabberd" (#667504)