commit cbcc8c1fcafc8b5c7c09d8b9d45e8799a7f46fe2 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Jan 3 15:04:22 2023 +0000 Use patch for mpd.conf mpd-0.22-mpdconf.patch | 30 ---------------- mpd-0.23-mpdconf.patch | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++ mpd.spec | 9 +---- 3 files changed, 94 insertions(+), 38 deletions(-) --- diff --git a/mpd-0.23-mpdconf.patch b/mpd-0.23-mpdconf.patch new file mode 100644 index 0000000..ccf03e7 --- /dev/null +++ b/mpd-0.23-mpdconf.patch @@ -0,0 +1,93 @@ +--- a/doc/mpdconf.example ++++ b/doc/mpdconf.example +@@ -10,14 +10,14 @@ + # be disabled and audio files will only be accepted over ipc socket (using + # file:// protocol) or streaming files over an accepted protocol. + # +-#music_directory "~/music" ++music_directory "/var/lib/mpd/music" + # + # This setting sets the MPD internal playlist directory. The purpose of this + # directory is storage for playlists created by MPD. The server will use + # playlist files not created by the server but only if they are in the MPD + # format. This setting defaults to playlist saving being disabled. + # +-#playlist_directory "~/.mpd/playlists" ++playlist_directory "/var/lib/mpd/playlists" + # + # This setting sets the location of the MPD database. This file is used to + # load the database at server start up and store the database while the +@@ -25,7 +25,7 @@ + # MPD to accept files over ipc socket (using file:// protocol) or streaming + # files over an accepted protocol. + # +-#db_file "~/.mpd/database" ++db_file "/var/lib/mpd/mpd.db" + + # These settings are the locations for the daemon log files for the daemon. + # +@@ -35,7 +35,7 @@ + # If you use systemd, do not configure a log_file. With systemd, MPD + # defaults to the systemd journal, which is fine. + # +-#log_file "~/.mpd/log" ++log_file "/var/log/mpd/mpd.log" + + # This setting sets the location of the file which stores the process ID + # for use of mpd --kill and some init scripts. This setting is disabled by +@@ -50,7 +50,7 @@ + # it was brought down. This setting is disabled by default and the server + # state will be reset on server start up. + # +-#state_file "~/.mpd/state" ++state_file "/var/lib/mpd/mpdstate" + # + # The location of the sticker database. This is a database which + # manages dynamic information attached to songs. +@@ -67,7 +67,7 @@ + # initialization. This setting is disabled by default and MPD is run as the + # current user. + # +-#user "nobody" ++user "mpd" + # + # This setting specifies the group that MPD will run as. If not specified + # primary group of user specified with "user" setting will be used (if set). +@@ -85,7 +85,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. +@@ -287,13 +287,13 @@ + # + # An example of a pulseaudio output (streaming to a remote pulseaudio server) + # +-#audio_output { +-# type "pulse" +-# name "My Pulse Output" ++audio_output { ++ type "pulse" ++ name "My Pulse Output" + ## server "remote_server" # optional + ## sink "remote_server_sink" # optional + ## media_role "media_role" #optional +-#} ++} + # + # An example of a winmm output (Windows multimedia API). + # +@@ -413,6 +413,6 @@ + # If file or directory names do not display correctly for your locale then you + # may need to modify this setting. + # +-#filesystem_charset "UTF-8" +-# +-############################################################################### ++filesystem_charset "UTF-8" ++# ++############################################################################### + diff --git a/mpd.spec b/mpd.spec index 6b18e5a..21be16f 100644 --- a/mpd.spec +++ b/mpd.spec @@ -32,7 +32,7 @@ Source2: https://pgp.key-server.io/download/0x236E8A58C6DB4512#/gpgkey.as Source3: mpd.logrotate Source4: mpd.tmpfiles.d Source5: mpd.xml -Patch0: mpd-0.22-mpdconf.patch +Patch0: mpd-0.23-mpdconf.patch Patch1: mpd-0.20-remove_NoNewPrivileges.patch Patch2: timidity_path.patch @@ -193,13 +193,6 @@ touch %{buildroot}%{mpd_logfile} touch %{buildroot}%{mpd_statefile} install -D -p -m644 doc/mpdconf.example %{buildroot}%{mpd_configfile} -sed -i -e "s|#music_directory.*$|music_directory \"%{mpd_musicdir}\"|g" \ - -e "s|#playlist_directory.*$|playlist_directory \"%{mpd_playlistsdir}\"|g" \ - -e "s|#db_file.*$|db_file \"%{mpd_dbfile}\"|g" \ - -e "s|#log_file.*$|log_file \"%{mpd_logfile}\"|g" \ - -e "s|#state_file.*$|state_file \"%{mpd_statefile}\"|g" \ - -e 's|#user.*$|user "mpd"|g' \ - %{buildroot}%{mpd_configfile} rm -rf %{buildroot}%{_docdir}/mpd/