rpms/mpd/devel .cvsignore, 1.4, 1.5 mpd.spec, 1.9, 1.10 sources, 1.4, 1.5

[Adrian Reber]

Author: adrian

Update of /cvs/free/rpms/mpd/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1727

Modified Files:
	.cvsignore mpd.spec sources 
Log Message:
* Mon Jun 29 2009 Adrian Reber <adrian at lisas.de> - 0.15-1
- updated to 0.15
- added "Conflicts: mpich2" (#593)
- added BR libmms-devel, libmodplug-devel, libsidplay-devel, bzip2-devel
           zziplib-devel, sqlite-devel
- changed BR avahi-devel to avahi-glib-devel
- adapted config file fixups to newest config file layout



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Feb 2009 21:52:11 -0000	1.4
+++ .cvsignore	29 Jun 2009 12:13:10 -0000	1.5
@@ -1 +1 @@
-mpd-0.14.2.tar.bz2
+mpd-0.15.tar.bz2


Index: mpd.spec
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/mpd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mpd.spec	29 Mar 2009 13:48:43 -0000	1.9
+++ mpd.spec	29 Jun 2009 12:13:10 -0000	1.10
@@ -1,11 +1,11 @@
 Name:           mpd
-Version:        0.14.2
-Release:        2%{?dist}
+Version:        0.15
+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.14.2.tar.bz2
+Source:         http://downloads.sourceforge.net/musicpd/mpd-0.15.tar.bz2
 Source1:        mpd.init
 Source2:        95-grant-audio-devices-to-mpd.fdi
 
@@ -24,7 +24,7 @@
 BuildRequires:  libmpcdec-devel
 BuildRequires:  pulseaudio-lib-devel
 BuildRequires:  libsamplerate-devel
-BuildRequires:  avahi-devel
+BuildRequires:  avahi-glib-devel
 BuildRequires:  jack-audio-connection-kit-devel
 BuildRequires:  faad2-devel
 BuildRequires:  libmad-devel
@@ -32,11 +32,19 @@
 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
 Requires(pre):  shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig /sbin/service
 Requires(postun): /sbin/service
 
+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
@@ -48,7 +56,7 @@
 %setup -q
 
 %build
-%configure --enable-mod 
+%configure --enable-mikmod --enable-bzip2 --enable-zip
 make %{?_smp_mflags}
 
 %install
@@ -73,7 +81,11 @@
 %{__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,#user                            "nobody",user "mpd",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
 
@@ -137,6 +149,14 @@
 %ghost %{_localstatedir}/lib/%{name}/mpdstate
 
 %changelog
+* Mon Jun 29 2009 Adrian Reber <adrian at lisas.de> - 0.15-1
+- updated to 0.15
+- added "Conflicts: mpich2" (#593)
+- added BR libmms-devel, libmodplug-devel, libsidplay-devel, bzip2-devel
+           zziplib-devel, sqlite-devel
+- changed BR avahi-devel to avahi-glib-devel
+- adapted config file fixups to newest config file layout
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.14.2-2
 - rebuild for new F11 features
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2009 21:52:11 -0000	1.4
+++ sources	29 Jun 2009 12:13:10 -0000	1.5
@@ -1 +1 @@
-66817a4b4c05454e6488f6b821f2a6a3  mpd-0.14.2.tar.bz2
+2ed93a60bd703ba46d6794e12cfb5f1d  mpd-0.15.tar.bz2