9:10 a.m.
Author: jamielinux
Update of /cvs/free/rpms/mpd/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13168/F-18
Modified Files:
mpd.spec
Added Files:
mpd-0.16.8-socket-location.patch mpd.tmpfiles.d
Log Message:
Add tmpfiles.d/mpd.conf
mpd-0.16.8-socket-location.patch:
mpdconf.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mpd-0.16.8-socket-location.patch ---
diff -Naur a/doc/mpdconf.example b/doc/mpdconf.example
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -81,7 +81,7 @@
#bind_to_address "any"
#
# And for Unix Socket
-#bind_to_address "~/.mpd/socket"
+#bind_to_address "/run/mpd/socket"
#
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
--- NEW FILE mpd.tmpfiles.d ---
d /run/mpd 0755 mpd mpd -
Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-18/mpd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mpd.spec 23 Feb 2013 22:59:20 -0000 1.31
+++ mpd.spec 24 Feb 2013 09:10:26 -0000 1.32
@@ -7,6 +7,7 @@
%global mpd_logdir %{_localstatedir}/log/mpd
%global mpd_musicdir %{mpd_homedir}/music
%global mpd_playlistsdir %{mpd_homedir}/playlists
+%global mpd_rundir /run/mpd
%global mpd_configfile %{_sysconfdir}/mpd.conf
%global mpd_dbfile %{mpd_homedir}/mpd.db
@@ -16,7 +17,7 @@
Name: mpd
Epoch: 1
Version: 0.16.8
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
Group: Applications/Multimedia
@@ -24,7 +25,9 @@
Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
Source1: mpd.logrotate
+Source2: mpd.tmpfiles.d
Patch0: mpd-0.16.7-default-pulseaudio.patch
+Patch1: mpd-0.16.8-socket-location.patch
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@@ -74,6 +77,7 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
%build
sed -i -e "s,sound.target,sound.target network.target,g" mpd.service.in
@@ -91,6 +95,11 @@
install -p -D -m 0644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+install -p -D -m 0644 %{SOURCE2} \
+ $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/mpd.conf
+mkdir -p %{buildroot}/run
+install -d -m 0755 %{buildroot}/%{mpd_rundir}
+
mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
@@ -139,18 +148,24 @@
%{_unitdir}/mpd.service
%config(noreplace) %{mpd_configfile}
%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
+%{_prefix}/lib/tmpfiles.d/%{name}.conf
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
%dir %{mpd_logdir}
%dir %{mpd_musicdir}
%dir %{mpd_playlistsdir}
+%dir %{mpd_rundir}
%ghost %{mpd_dbfile}
%ghost %{mpd_logfile}
%ghost %{mpd_statefile}
%changelog
+* Sun Feb 24 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-8
+- add tmpfiles.d/mpd.conf in case user wishes to use socket file
+- change default socket location in mpd.conf, but leave commented
+
* Sat Feb 23 2013 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-7
- update systemd scriptlets and remove chkconfig from the Requires
- add a logrotate file
@@ -165,19 +180,19 @@
- Rebuilt for FFmpeg
- Switch BR to pkgconfig(libpulse)
-* Fri May 11 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-3
+* Fri May 11 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.8-3
- enable lastfm support
- enable hardened build
- remove redundant libsidplay-devel BR, as mpd requires libsidplay2
-* Mon Apr 09 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-2
+* Mon Apr 09 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.8-2
- add missing chowns to %%post scriptlet
- add missing %%{mpd_logdir} to %%files
-* Mon Apr 09 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.8-1
+* Mon Apr 09 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.8-1
- update to 0.16.8
-* Sat Feb 25 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 1:0.16.7-2
+* Sat Feb 25 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 1:0.16.7-2
- remove obsolete BuildRoot tag, %%clean section and unnecessary macros
- do not add mpd to pulse-rt group as system mode is not recommended by
pulseaudio upstream, and the group no longer exists
@@ -185,10 +200,10 @@
- add Epoch (for triggerun scriptlet) to allow updates to F16
- change default audio output to pulseaudio
-* Sun Feb 05 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.7-1
+* Sun Feb 05 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.7-1
- update to 0.16.7
-* Sun Jan 08 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.6-1
+* Sun Jan 08 2012 Jamie Nguyen <jamielinux(a)fedoraproject.org> - 0.16.6-1
- update to 0.16.6
- add convenient global variables
- add systemd unit file instead of initscript