[pyicq-t] Changed spec and init files and added tmpfiles.conf to follow latest packaging guidelines

[Stefan Schulze Frielinghaus]

commit 82f74a4288b58c55b6443c7f5b3abfbc0e4428b7
Author: Stefan Schulze Frielinghaus <stefansf at fedoraproject.org>
Date:   Sat Feb 5 17:43:02 2011 +0100

    Changed spec and init files and added tmpfiles.conf to follow latest packaging guidelines

 pyicq-t-tmpfiles.conf |    1 +
 pyicq-t.init          |    8 +-------
 pyicq-t.spec          |   11 ++++++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/pyicq-t-tmpfiles.conf b/pyicq-t-tmpfiles.conf
new file mode 100644
index 0000000..24d4650
--- /dev/null
+++ b/pyicq-t-tmpfiles.conf
@@ -0,0 +1 @@
+D /var/run/pyicq-t 0755 pyicqt pyicqt -
diff --git a/pyicq-t.init b/pyicq-t.init
index f80c87f..cd79027 100644
--- a/pyicq-t.init
+++ b/pyicq-t.init
@@ -13,18 +13,12 @@
 prog="PyICQt"
 exec="/usr/share/pyicq-t/PyICQt.py"
 config="/etc/pyicq-t/config.xml"
-piddir="/var/run/pyicq-t"
-pidfile="$piddir/pyicq-t.pid"
+pidfile="/var/run/pyicq-t/pyicq-t.pid"
 lockfile="/var/lock/subsys/pyicq-t"
 
 start() {
 	[ -x $exec ] || exit 5
 	[ -f $config ] || exit 6
-	if [ ! -d $piddir ]; then
-		mkdir -m 755 $piddir
-		chown pyicqt:pyicqt $piddir
-		restorecon $piddir
-	fi
 	echo -n $"Starting $prog: "
 	daemon --user=pyicqt --pidfile=$pidfile $exec \
 				--background \
diff --git a/pyicq-t.spec b/pyicq-t.spec
index d2dee7e..3d9e9fa 100644
--- a/pyicq-t.spec
+++ b/pyicq-t.spec
@@ -2,7 +2,7 @@
 
 Name:           pyicq-t
 Version:        0.8.1.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        ICQ Transport for Jabber Servers
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@ License:        GPLv2+
 URL:            http://code.google.com/p/pyicqt/
 Source0:        http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
 Source1:        pyicq-t.init
+Source2:        pyicq-t-tmpfiles.conf
 Patch0:         config.patch
 
 BuildArch:      noarch
@@ -73,6 +74,9 @@ cp PyICQt.py* %{buildroot}%{_datadir}/pyicq-t
 cp -r data %{buildroot}%{_datadir}/pyicq-t
 cp -r src %{buildroot}%{_datadir}/pyicq-t
 
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+install -D -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
+
 %clean
 rm -rf %{buildroot}
 
@@ -103,6 +107,7 @@ 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
 
 %exclude %{_datadir}/pyicq-t/src/xdb/mysql.py*
 %dir %{_datadir}/pyicq-t
@@ -112,6 +117,7 @@ fi
 %{_datadir}/pyicq-t/PyICQt.pyo
 %{_datadir}/pyicq-t/src
 
+%attr(0755,pyicqt,pyicqt) %dir %{_localstatedir}/run/%{name}/
 %attr(0700,pyicqt,pyicqt) %dir %{_localstatedir}/spool/pyicq-t
 
 %files mysql
@@ -121,6 +127,9 @@ fi
 %{_datadir}/pyicq-t/src/xdb/mysql.py*
 
 %changelog
+* Sat Feb 5 2011 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 0.8.1.5-8
+- Update package to follow latest packaging guidelines
+
 * Thu Jan 27 2011 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 0.8.1.5-7
 - Create /var/run/pyicq-t automatically by the init script