[pyicq-t/f17] Apply latest packaging guidelines updates

[Stefan Schulze Frielinghaus]

commit ac1b234a98bd8f124196bfa90e5784d4492db5fc
Author: Stefan Schulze Frielinghaus <stefansf at fedoraproject.org>
Date:   Mon Jun 11 13:52:52 2012 +0200

    Apply latest packaging guidelines updates

 config.patch          |    2 +-
 pyicq-t-tmpfiles.conf |    2 +-
 pyicq-t.service       |    1 -
 pyicq-t.spec          |   10 +++++++---
 4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/config.patch b/config.patch
index 5098c1d..272dfd4 100644
--- a/config.patch
+++ b/config.patch
@@ -10,7 +10,7 @@
  	<!-- The location of the PID file.. if relative, relative to this dir. -->
  	<!-- Comment out if you do not want a pid file -->
 -	<pid>PyICQt.pid</pid>
-+	<pid>/var/run/pyicq-t/pyicq-t.pid</pid>
++	<pid>/run/pyicq-t/pyicq-t.pid</pid>
  
  	<!-- The IP address of the main Jabberd server -->
  	<mainServer>127.0.0.1</mainServer>
diff --git a/pyicq-t-tmpfiles.conf b/pyicq-t-tmpfiles.conf
index 24d4650..24a0479 100644
--- a/pyicq-t-tmpfiles.conf
+++ b/pyicq-t-tmpfiles.conf
@@ -1 +1 @@
-D /var/run/pyicq-t 0755 pyicqt pyicqt -
+d /run/pyicq-t 0755 pyicqt pyicqt -
diff --git a/pyicq-t.service b/pyicq-t.service
index efff9e0..87394db 100644
--- a/pyicq-t.service
+++ b/pyicq-t.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=PyICQt is an ICQ transport for Jabber/XMPP
-After=syslog.target
 
 [Service]
 Type=forking
diff --git a/pyicq-t.spec b/pyicq-t.spec
index edf6c7d..d5d52bd 100644
--- a/pyicq-t.spec
+++ b/pyicq-t.spec
@@ -2,7 +2,7 @@
 
 Name:           pyicq-t
 Version:        0.8.1.5
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
@@ -72,7 +72,7 @@ cp -r data %{buildroot}%{_datadir}/pyicq-t
 cp -r src %{buildroot}%{_datadir}/pyicq-t
 
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/pyicq-t.service
-install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
 
 %clean
 rm -rf %{buildroot}
@@ -107,7 +107,8 @@ fi
 
 %attr(0700,pyicqt,pyicqt) %dir %{_sysconfdir}/pyicq-t
 %attr(0600,pyicqt,pyicqt) %config(noreplace) %{_sysconfdir}/pyicq-t/config.xml
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+
+%{_prefix}/lib/tmpfiles.d/%{name}.conf
 
 %exclude %{_datadir}/pyicq-t/src/xdb/mysql.py*
 %dir %{_datadir}/pyicq-t
@@ -126,6 +127,9 @@ fi
 %{_datadir}/pyicq-t/src/xdb/mysql.py*
 
 %changelog
+* Mon Jun 11 2012 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 0.8.1.5-13
+- Apply latest packaging guidelines updates
+
 * Fri Jun 1 2012 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 0.8.1.5-12
 - Remove directory /var/run/pyicq-t due to change of /var/run to tmpfs