rpms/mpd/F-16 mpd-0.16.7-default-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 mpd.spec, 1.21, 1.22 sources, 1.13, 1.14 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch, 1.1, NONE 95-grant-audio-devices-to-mpd.fdi, 1.1, NONE mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch, 1.1, NONE mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch, 1.1, NONE mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch, 1.1, NONE

[Jamie Nguyen]

Author: jamielinux

Update of /cvs/free/rpms/mpd/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27637/F-16

Modified Files:
	.cvsignore mpd.spec sources 
Added Files:
	mpd-0.16.7-default-pulseaudio.patch 
Removed Files:
	6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch 
	95-grant-audio-devices-to-mpd.fdi 
	mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch 
	mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch 
	mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch 
Log Message:
Update to 0.16.7 and migrate to systemd.



mpd-0.16.7-default-pulseaudio.patch:
 mpdconf.example |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mpd-0.16.7-default-pulseaudio.patch ---
--- doc/mpdconf.example
+++ doc/mpdconf.example
@@ -269,12 +269,12 @@
 #
 # 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
-#}
+}
 #
 ## Example "pipe" output:
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/F-16/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	12 Oct 2011 19:14:45 -0000	1.13
+++ .cvsignore	26 Feb 2012 19:37:16 -0000	1.14
@@ -1 +1 @@
-mpd-0.16.5.tar.gz
+mpd-0.16.7.tar.bz2


Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/F-16/mpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mpd.spec	12 Oct 2011 19:14:45 -0000	1.21
+++ mpd.spec	26 Feb 2012 19:37:16 -0000	1.22
@@ -1,136 +1,132 @@
-%define _default_patch_fuzz 2
+%global  mpd_user            mpd
+%global  mpd_group           %{mpd_user}
+
+%global  mpd_homedir         %{_localstatedir}/lib/mpd
+%global  mpd_logdir          %{_localstatedir}/log/mpd
+%global  mpd_musicdir        %{mpd_homedir}/music
+%global  mpd_playlistsdir    %{mpd_homedir}/playlists
+
+%global  mpd_configfile      %{_sysconfdir}/mpd.conf
+%global  mpd_dbfile          %{mpd_homedir}/mpd.db
+%global  mpd_logfile         %{mpd_logdir}/mpd.log
+%global  mpd_statefile       %{mpd_homedir}/mpdstate
 
 Name:           mpd
-Version:        0.16.5
+Version:        0.16.7
 Release:        1%{?dist}
 Summary:        The Music Player Daemon
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://mpd.wikia.com/
-Source:         http://downloads.sourceforge.net/musicpd/mpd-0.16.5.tar.gz
+
+Source0:        http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
 Source1:        mpd.init
-Source2:        95-grant-audio-devices-to-mpd.fdi
-#Patch0:         mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch
-#Patch1:         mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch
-#Patch2:         mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch
-#Patch3:         6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libao-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  flac-devel
-BuildRequires:  audiofile-devel
-BuildRequires:  libid3tag-devel
-BuildRequires:  mikmod-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:  zlib-devel
-BuildRequires:  libshout-devel 
-BuildRequires:  libmpcdec-devel
-BuildRequires:  pulseaudio-lib-devel
-BuildRequires:  libsamplerate-devel
-BuildRequires:  avahi-glib-devel
-BuildRequires:  jack-audio-connection-kit-devel
-BuildRequires:  faad2-devel
-BuildRequires:  libmad-devel
-BuildRequires:  lame-devel
-BuildRequires:  ffmpeg-devel
-BuildRequires:  wavpack-devel
-BuildRequires:  libcurl-devel
-BuildRequires:  libmms-devel
-BuildRequires:  libmodplug-devel
-BuildRequires:  libsidplay-devel
-BuildRequires:  bzip2-devel
-BuildRequires:  zziplib-devel
-BuildRequires:  sqlite-devel
-BuildRequires:  autoconf
-BuildRequires:  libcue-devel
-Requires(pre):  shadow-utils
-Requires(post): chkconfig
-Requires(preun): chkconfig /sbin/service
-Requires(postun): /sbin/service
+Patch0:         mpd-0.16.7-default-pulseaudio.patch
 
-Conflicts: mpich2
+BuildRequires:     alsa-lib-devel
+BuildRequires:     audiofile-devel
+BuildRequires:     autoconf
+BuildRequires:     avahi-glib-devel
+BuildRequires:     bzip2-devel
+BuildRequires:     faad2-devel
+BuildRequires:     ffmpeg-devel
+BuildRequires:     flac-devel
+BuildRequires:     jack-audio-connection-kit-devel
+BuildRequires:     lame-devel
+BuildRequires:     libao-devel
+BuildRequires:     libcue-devel
+BuildRequires:     libcurl-devel
+BuildRequires:     libid3tag-devel
+BuildRequires:     libmad-devel
+BuildRequires:     libmms-devel
+BuildRequires:     libmodplug-devel
+BuildRequires:     libmpcdec-devel
+BuildRequires:     libogg-devel
+BuildRequires:     libsamplerate-devel
+BuildRequires:     libshout-devel 
+BuildRequires:     libsidplay-devel
+BuildRequires:     libvorbis-devel
+BuildRequires:     mikmod-devel
+BuildRequires:     pulseaudio-lib-devel
+BuildRequires:     sqlite-devel
+BuildRequires:     wavpack-devel
+BuildRequires:     zlib-devel
+BuildRequires:     zziplib-devel
+Requires(pre):     shadow-utils
+Requires(post):    chkconfig
+Requires(preun):   chkconfig initscripts
+Requires(postun):  initscripts
+Conflicts:         mpich2
 
 %description
-Music Player Daemon (MPD) allows remote access for playing music (MP3, Ogg
-Vorbis, FLAC, Mod, AAC and wave files) and managing playlists. MPD is designed
-for integrating a computer into a stereo system that provides control for music
-playback over a local network. It is also makes a great desktop music player,
-especially if you are a console junkie, like frontend options or restart X often
+Music Player Daemon (MPD) is a flexible, powerful, server-side application for
+playing music. Through plugins and libraries it can play a variety of sound
+files (e.g., OGG, MP3, FLAC, AAC, WAV) and can be controlled remotely via its
+network protocol. It can be used as a desktop music player, but is also great
+for streaming music to a stereo system over a local network. There are many
+GUI and command-line applications to choose from that act as a front-end for
+browsing and playing your MPD music collection.
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#autoreconf --force --install
+%patch0 -p0
 
 %build
-%configure --enable-mikmod --enable-bzip2 --enable-zip
+%configure --enable-mikmod --enable-bzip2 --enable-zzip
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# conf file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
+mkdir -p $RPM_BUILD_ROOT%{mpd_playlistsdir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/playlists
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/music
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.log
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.error
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpd.db
-touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/mpdstate
-install -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/music,%{_localstatedir}/lib/%{name}/music,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/playlists,%{_localstatedir}/lib/%{name}/playlists,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/log,%{_localstatedir}/lib/%{name}/mpd.log,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/error-log,%{_localstatedir}/lib/%{name}/mpd.error,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/database,%{_localstatedir}/lib/%{name}/mpd.db,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,~/.mpd/state,%{_localstatedir}/lib/%{name}/mpdstate,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#state_file,state_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#music_directory,music_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#playlist_directory,playlist_directory,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#db_file,db_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e "s,#log_file,log_file,g" $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -i -e 's,#user.*"nobody",user "mpd",g' $RPM_BUILD_ROOT%{_sysconfdir}/mpd.conf
-%{__sed} -e "s, at bindir@,%{_bindir},g;s, at var@,%{_localstatedir},g" %{SOURCE1} > $RPM_BUILD_ROOT%{_initrddir}/%{name}
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+touch $RPM_BUILD_ROOT%{mpd_dbfile}
+touch $RPM_BUILD_ROOT%{mpd_logfile}
+touch $RPM_BUILD_ROOT%{mpd_statefile}
+
+install -D -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{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' \
+       $RPM_BUILD_ROOT%{mpd_configfile}
+
+sed -e "s|@bindir@|%{_bindir}|g" \
+    -e "s|@var@|%{_localstatedir}|g" \
+    %{SOURCE1} > $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
 
 %pre
-#creating mpd user
-getent group mpd >/dev/null || groupadd -r mpd
-getent passwd mpd >/dev/null || \
-useradd -r -g mpd -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
-	-c "Music Player Daemon" mpd
-# fix for pulseaudio playback (#230)
-usermod -aG pulse-rt mpd
-usermod -aG audio mpd
-exit 0
-
+if [ $1 -eq 1 ]; then
+    getent group %{mpd_group} >/dev/null || groupadd -r %{mpd_group}
+    getent passwd %{mpd_user} >/dev/null || \
+    useradd -r -g %{mpd_group} -d %{mpd_homedir} -s /sbin/nologin \
+        -c "Music Player Daemon" %{mpd_user}
+    gpasswd -a %{mpd_group} audio || :
+    exit 0
+fi
 
 %post
 if [ "$1" -eq "1" ]; then
-        #register %{name} service
         /sbin/chkconfig --add %{name}
 else
-	# as we switched from running as root.root to mpd.mpd
-	# chown the db files and playlists on upgrades
-	chown -R mpd.mpd %{_localstatedir}/lib/%{name}/playlists > /dev/null 2>&1 ||:
-	chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.log > /dev/null 2>&1 ||:
-	chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.error > /dev/null 2>&1 ||:
-	chown mpd.mpd %{_localstatedir}/lib/%{name}/mpd.db > /dev/null 2>&1 ||:
-	chown mpd.mpd %{_localstatedir}/lib/%{name}/mpdstate > /dev/null 2>&1 ||:
+    # as we switched from running as root.root to mpd.mpd
+    # chown the db files and playlists on upgrades
+    chown -R %{mpd_user}.%{mpd_group} \
+        %{mpd_playlistsdir} > /dev/null 2>&1 ||:
+    chown %{mpd_user}.%{mpd_group} \
+        %{mpd_dbfile} > /dev/null 2>&1 ||:
+    chown %{mpd_user}.%{mpd_group} \
+        %{mpd_logfile} > /dev/null 2>&1 ||:
+    chown %{mpd_user}.%{mpd_group} \
+        %{mpd_statefile} > /dev/null 2>&1 ||:
 fi
 
 %preun
@@ -145,24 +141,34 @@
 fi
 
 %files
-%defattr(-,root,root)
 %doc README UPGRADING AUTHORS COPYING
 %{_bindir}/%name
 %attr(755,root,root) %{_initrddir}/%{name}
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%{_datadir}/hal/fdi/policy/20thirdparty/*fdi
-%defattr(-,mpd,mpd)
 %config(noreplace) %{_sysconfdir}/mpd.conf
-%dir %{_localstatedir}/lib/%{name}
-%{_localstatedir}/lib/%{name}/playlists
-%{_localstatedir}/lib/%{name}/music
-%ghost %{_localstatedir}/lib/%{name}/mpd.log
-%ghost %{_localstatedir}/lib/%{name}/mpd.error
-%ghost %{_localstatedir}/lib/%{name}/mpd.db
-%ghost %{_localstatedir}/lib/%{name}/mpdstate
+
+%defattr(-,%{mpd_user},%{mpd_group})
+%dir %{mpd_homedir}
+%dir %{mpd_musicdir}
+%dir %{mpd_playlistsdir}
+%ghost %{mpd_dbfile}
+%ghost %{mpd_logfile}
+%ghost %{mpd_statefile}
 
 %changelog
+* Sat Feb 25 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 0.16.7-1
+- update to upstream release 0.16.7
+- add convenient global variables
+- change incorrect --enable-zip to --enable-zzip
+- change default log file location to /var/log/mpd/mpd.log
+- change default audio output to pulseaudio
+- remove obsolete BuildRoot tag, %%clean section and %%defattr
+- remove obsolete mpd-error file
+- remove obsolete hal fdi file
+- do not add mpd to pulse-rt group as system mode is not recommended by
+  pulseaudio upstream, and the group no longer exists
+
 * Wed Oct 12 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.16.5-1
 - Update to latest upstream release (#1954)
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/F-16/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Oct 2011 19:14:45 -0000	1.13
+++ sources	26 Feb 2012 19:37:16 -0000	1.14
@@ -1 +1 @@
-5fb4c97623eca26d2d8b968868e2f13f  mpd-0.16.5.tar.gz
+3d0e7c36646e80386b32966bd4268e8d  mpd-0.16.7.tar.bz2


--- 6a071efa2794806ad5a2a62f0fcdee4b1843b41f.patch DELETED ---


--- 95-grant-audio-devices-to-mpd.fdi DELETED ---


--- mpd.git-00503c9251141b427457c17a9677444bf29c3992.patch DELETED ---


--- mpd.git-9e9d7b73d2165f197eeec12ee953add5f49746b7.patch DELETED ---


--- mpd.git-f3a5b753ae053eb1a862343b0fd3d62973cacc18.patch DELETED ---