packages: mpd/mpd.spec - use existing homedir for mpd user; adapter

[glen]

Author: glen                         Date: Fri Mar 30 18:42:59 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use existing homedir for mpd user; adapter

---- Files affected:
packages/mpd:
   mpd.spec (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: packages/mpd/mpd.spec
diff -u packages/mpd/mpd.spec:1.79 packages/mpd/mpd.spec:1.80
--- packages/mpd/mpd.spec:1.79	Thu Feb 16 22:15:12 2012
+++ packages/mpd/mpd.spec	Fri Mar 30 20:42:54 2012
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Music Player Daemon - demon odtwarzający muzykę
 Name:		mpd
 Version:	0.16.7
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
@@ -48,8 +48,8 @@
 BuildRequires:	libmpcdec-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libsamplerate-devel >= 0.0.15
-BuildRequires:	libsidplay2-devel >= 2.1.1-5
 BuildRequires:	libshout-devel
+BuildRequires:	libsidplay2-devel >= 2.1.1-5
 BuildRequires:	libvorbis-devel
 BuildRequires:	pkgconfig >= 1:0.9.0
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
@@ -173,7 +173,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
 	$RPM_BUILD_ROOT{/var/lib/mpd/playlists,/var/log/mpd,/var/run/mpd} \
-	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -181,7 +181,7 @@
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mpd
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/mpd
-install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 touch $RPM_BUILD_ROOT/var/lib/mpd/mpd.db
 touch $RPM_BUILD_ROOT/var/lib/mpd/mpdstate
@@ -195,7 +195,7 @@
 
 %pre
 %groupadd -g 204 mpd
-%useradd -u 204 -r -d /home/services/mpd -s /bin/false -c "Music Player Daemon (MPD) user" -G audio -g mpd mpd
+%useradd -u 204 -r -d /var/lib/mpd -s /bin/false -c "Music Player Daemon (MPD) user" -G audio -g mpd mpd
 
 %post
 for f in mpd.log; do
@@ -232,7 +232,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mpd.conf
 %attr(754,root,root) /etc/rc.d/init.d/mpd
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mpd
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
 %{systemdunitdir}/mpd.service
 %dir %attr(770,root,mpd) /var/lib/%{name}
 %dir %attr(770,root,mpd) /var/lib/%{name}/playlists
@@ -259,6 +259,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2012/03/30 18:42:54  glen
+- use existing homedir for mpd user; adapter
+
 Revision 1.79  2012/02/16 21:15:12  wiget
 - up to 0.16.7
 - enable sidplay
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/mpd/mpd.spec?r1=1.79&r2=1.80