[mldonkey] Systemd-related cleanups

[Peter Lemenkov]

commit 2a45ff06778cadc4d58435ca1e7187396012c6f1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Sep 6 16:56:51 2013 +0400

    Systemd-related cleanups
    
    - Add tmpfiles.d entry
    - Restore optional support for sysconfig files
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 mldonkey.service       |    2 ++
 mldonkey.spec          |   11 ++++++++++-
 mldonkey.tmpfiles.conf |    1 +
 3 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/mldonkey.service b/mldonkey.service
index a0884ef..df49df1 100644
--- a/mldonkey.service
+++ b/mldonkey.service
@@ -4,6 +4,8 @@ After=network.target
 
 [Service]
 User=mldonkey
+Environment=MLDONKEY_DIR=/var/lib/mldonkey
+EnvironmentFile=-/etc/sysconfig/mldonkey
 ExecStart=/usr/bin/mlnet -log_to_syslog yes -log_file /dev/null -pid /run/mldonkey
 
 [Install]
diff --git a/mldonkey.spec b/mldonkey.spec
index b0581dc..487febf 100644
--- a/mldonkey.spec
+++ b/mldonkey.spec
@@ -1,12 +1,13 @@
 Name:              mldonkey
 Version:           3.1.3
-Release:           1%{?dist}
+Release:           2%{?dist}
 Summary:           Multiple P2P Network Client
 License:           GPLv2+
 URL:               http://mldonkey.sourceforge.net
 Source0:           http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:           mldonkey.logrotate
 Source2:           mldonkey.service
+Source3:           mldonkey.tmpfiles.conf
 BuildRequires:     bzip2-devel
 BuildRequires:     desktop-file-utils
 BuildRequires:     file-devel
@@ -168,6 +169,9 @@ sed -i 's,/var,%{_localstatedir},g' %{buildroot}%{_sysconfdir}/logrotate.d/mldon
 
 install -pDm644 %{S:2} %{buildroot}%{_unitdir}/mldonkey.service
 
+# Install tmpfiles.d entry
+install -D -m 644 %{S:3} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+
 # Create necessary directories for server
 install -d -m 755 %{buildroot}%{_localstatedir}/cache/mldonkey
 install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}/incoming
@@ -264,6 +268,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc Copying.txt
 %config(noreplace) %{_sysconfdir}/logrotate.d/mldonkey
 %{_unitdir}/mldonkey.service
+%{_tmpfilesdir}/%{name}.conf
 %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/log/mldonkey
 %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/cache/mldonkey
 %attr(750,mldonkey,mldonkey) %dir %{_localstatedir}/lib/mldonkey
@@ -280,6 +285,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 # Prepare to enable UPnP support.
 
 %changelog
+* Fri Sep 06 2013 Peter Lemenkov <lemenkov at gmail.com> - 3.1.3-2
+- Add tmpfiles.d entry
+- Restore optional support for sysconfig files
+
 * Sat Aug 10 2013 Christopher Meng <rpm at cicku.me> - 3.1.3-1
 - Major upgrade.
 - SPEC cleanup(systemd macro, obsoleted tags)
diff --git a/mldonkey.tmpfiles.conf b/mldonkey.tmpfiles.conf
new file mode 100644
index 0000000..ffc2de0
--- /dev/null
+++ b/mldonkey.tmpfiles.conf
@@ -0,0 +1 @@
+d /var/run/mldonkey 0755 mldonkey mldonkey