[mt-daapd] Fix user/group management and startup script
Jean-Francois Saucier
jfsaucier at fedoraproject.org
Wed Aug 7 16:08:45 UTC 2013
commit 84becbdfa9f7d22ed155706a7c50e2e3ec913181
Author: Jean-Francois Saucier <jsaucier at gmail.com>
Date: Wed Aug 7 12:08:33 2013 -0400
Fix user/group management and startup script
mt-daapd.service | 2 +-
mt-daapd.spec | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/mt-daapd.service b/mt-daapd.service
index 47dec92..ede59c6 100644
--- a/mt-daapd.service
+++ b/mt-daapd.service
@@ -3,7 +3,7 @@ Description=mt-daapd - multi-threaded DAAP server for iTunes
ConditionPathExists=/etc/mt-daapd.conf
Requires=network.target
Wants=avahi-daemon.service
-After=avahi-daemon.service
+After=avahi-daemon.service remote-fs.target
[Service]
Type=forking
diff --git a/mt-daapd.spec b/mt-daapd.spec
index a09fcde..4f86e22 100644
--- a/mt-daapd.spec
+++ b/mt-daapd.spec
@@ -1,6 +1,3 @@
-%bcond_without fedora
-
-%global uid 72
%global username mt-daapd
%global homedir %_var/lib/%username
%global gecos mt-daapd
@@ -9,7 +6,7 @@ Summary: An iTunes-compatible media server
Name: mt-daapd
Epoch: 1
Version: 0.2.4.2
-Release: 16%{?dist}
+Release: 17%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -27,9 +24,6 @@ Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-Provides: group(%username) = %uid
-Provides: user(%username) = %uid
-
%description
The purpose of this project is built the best server software to serve
digital music to the Roku Soundbridge and iTunes; to be able to serve
@@ -49,14 +43,15 @@ make %{?_smp_mflags}
make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_unitdir}
mkdir -p %{buildroot}%{_localstatedir}/cache/mt-daapd
+mkdir -p %{buildroot}%{_localstatedir}/lib/mt-daapd
install %{SOURCE1} %{buildroot}%{_unitdir}/
mkdir -p %{buildroot}%{_sysconfdir}
install -m 0640 contrib/mt-daapd.conf %{buildroot}%{_sysconfdir}/
%pre
-getent group %{username} >/dev/null || groupadd -r %{username} -g %{uid}
+getent group %{username} >/dev/null || groupadd -r %{username}
getent passwd %{username} >/dev/null || \
- useradd -r -g %{username} -d %{homedir} -s /sbin/nologin -u %{uid} \
+ useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \
-c '%{gecos}' %{username}
exit 0
@@ -95,10 +90,15 @@ fi
%{_sbindir}/mt-daapd
%{_datadir}/mt-daapd
%{_unitdir}/%{name}.service
-%attr(0700,mt-daapd,root) %{_localstatedir}/cache/mt-daapd
+%attr(0700,mt-daapd,mt-daapd) %{_localstatedir}/cache/mt-daapd
+%attr(0700,mt-daapd,mt-daapd) %{_localstatedir}/lib/mt-daapd
%doc AUTHORS COPYING CREDITS NEWS README TODO
%changelog
+* Wed Aug 07 2013 Jean-Francois Saucier <jsaucier at gmail.com> - 1:0.2.4.2-17
+- Remove the fixed uid allocation
+- Fix the systemd service file to start after remote fs
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.2.4.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list