[jabberd/f13/master] - re-add the server.pem ghost as %config(noreplace) to prevent the file from being deleted when up

[Dominic Hopf]

commit c76aff397dc2511bef20669595a0796a42d21192
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Tue Nov 9 22:11:50 2010 +0100

    - re-add the server.pem ghost as %config(noreplace) to prevent the
      file from being deleted when updating to this package
    - fix permissions for directories and files under /var/lib/jabberd

 jabberd.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/jabberd.spec b/jabberd.spec
index b587c78..c2e1d34 100644
--- a/jabberd.spec
+++ b/jabberd.spec
@@ -1,7 +1,7 @@
 Summary:        OpenSource server implementation of the Jabber protocols
 Name:           jabberd
 Version:        2.2.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Daemons
 Source0:        http://ftp.xiaoka.com/jabberd2/releases/jabberd-%{version}.tar.bz2
@@ -31,11 +31,12 @@ 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 +78,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 +119,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 +183,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 +194,14 @@ 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
+* Tue Nov 09 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-3
+- re-add the server.pem ghost as %%config(noreplace) to prevent the
+  file from being deleted when updating to this package
+- fix permissions for directories and files under /var/lib/jabberd
+
 * Wed Oct 06 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-2
 - new upstream release jabberd 2.2.11
 - fix script-without-shebang errors