[pyicq-t] Fix bug #656679
Stefan Schulze Frielinghaus
stefansf at fedoraproject.org
Thu Jan 27 14:53:55 UTC 2011
commit a2eec9f0a93b0e2fd72d3a4e4869718e598371b3
Author: Stefan Schulze Frielinghaus <stefansf at fedoraproject.org>
Date: Thu Jan 27 15:52:55 2011 +0100
Fix bug #656679
pyicq-t.init | 8 +++++++-
pyicq-t.spec | 14 ++++++--------
2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/pyicq-t.init b/pyicq-t.init
index cd79027..f80c87f 100644
--- a/pyicq-t.init
+++ b/pyicq-t.init
@@ -13,12 +13,18 @@
prog="PyICQt"
exec="/usr/share/pyicq-t/PyICQt.py"
config="/etc/pyicq-t/config.xml"
-pidfile="/var/run/pyicq-t/pyicq-t.pid"
+piddir="/var/run/pyicq-t"
+pidfile="$piddir/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 ad5a4d3..d2dee7e 100644
--- a/pyicq-t.spec
+++ b/pyicq-t.spec
@@ -2,7 +2,7 @@
Name: pyicq-t
Version: 0.8.1.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: ICQ Transport for Jabber Servers
Group: Applications/Internet
@@ -12,8 +12,6 @@ Source0: http://pyicqt.googlecode.com/files/pyicqt-%{version}.tar.gz
Source1: pyicq-t.init
Patch0: config.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: python-devel
Requires: python-twisted-core
@@ -40,13 +38,13 @@ their ICQ contacts in the same way as they do with their Jabber
contacts.
%package mysql
-Summary: MySQL backend for ICQ transport
+Summary: MySQL back end for ICQ transport
Group: Applications/Internet
Requires: MySQL-python
Requires: pyicq-t = %{version}-%{release}
%description mysql
-MySQL backend for ICQ transport
+MySQL back end for ICQ transport
%prep
%setup -q -n pyicqt-%{version}
@@ -64,7 +62,6 @@ chmod 644 tools/migrate.py
mkdir -p %{buildroot}/etc/pyicq-t
mkdir -p %{buildroot}%{_datadir}/pyicq-t
-mkdir -p %{buildroot}%{_localstatedir}/run/pyicq-t
mkdir -p %{buildroot}/var/spool/pyicq-t
mkdir -p %{buildroot}%{_initrddir}
@@ -117,8 +114,6 @@ fi
%attr(0700,pyicqt,pyicqt) %dir %{_localstatedir}/spool/pyicq-t
-%attr(0755,pyicqt,pyicqt) %dir %{_localstatedir}/run/pyicq-t
-
%files mysql
%defattr(-,root,root,-)
%doc tools/db-setup.mysql
@@ -126,6 +121,9 @@ fi
%{_datadir}/pyicq-t/src/xdb/mysql.py*
%changelog
+* 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
+
* Wed Aug 11 2010 Stefan Schulze Frielinghaus <stefansf at fedoraproject.org> - 0.8.1.5-6
- Rebuilt for Python 2.7
More information about the scm-commits
mailing list