X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mpd.spec;h=45e185fab7c0b3907d1f066d348466e43bc546a6;hb=6ba39ac6f077889ab8b555568e23e707b39b4373;hp=ca9396e2dfbe9888943eea2182f353f94f41892b;hpb=7e7be0d049312239bf6b13859ae8c5ec88910a25;p=packages%2Fmpd.git

diff --git a/mpd.spec b/mpd.spec
index ca9396e..45e185f 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -2,61 +2,111 @@
 # - add logrotate
 #
 # Conditional build:
-%bcond_without	mod		# enable MOD support
-%bcond_without	pulseaudio	# disable PulseAudio support
+%bcond_without	mod		# MOD support via libmikmod
+%bcond_without	pulseaudio	# PulseAudio support
+%bcond_without	audiofile	# Audiofile support (WAV and others)
 
 Summary:	Music Player Daemon
-Summary(hu.UTF-8):	Music Player Daemon
 Summary(pl.UTF-8):	Music Player Daemon - demon odtwarzający muzykę
 Name:		mpd
-Version:	0.16.3
-Release:	3
+Version:	0.20.22
+Release:	1
 License:	GPL v2+
 Group:		Applications/Multimedia
-Source0:	http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
-# Source0-md5:	6e708c02b0e8c288aec855eecf441a5a
+Source0:	http://www.musicpd.org/download/mpd/0.20/%{name}-%{version}.tar.xz
+# Source0-md5:	6acee2bc5b30f6c97fdaf46682b0116c
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
+Source4:	%{name}.tmpfiles
+Patch0:		%{name}-mpcsv8.patch
 URL:		http://www.musicpd.org/
-Patch0:		%{name}-ffmpeg_sigsegv.patch
 BuildRequires:	OpenAL-devel
+BuildRequires:	adplug-devel
 BuildRequires:	alsa-lib-devel >= 0.9.0
-BuildRequires:	audiofile-devel >= 0.1.7
-BuildRequires:	avahi-glib-devel
+%{?with_audiofile:BuildRequires:	audiofile-devel >= 0.3}
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	avahi-devel
+BuildRequires:	boost-devel >= 1.54
 BuildRequires:	bzip2-devel
-BuildRequires:	curl-devel
+BuildRequires:	curl-devel >= 7.18
+BuildRequires:	dbus-devel
 BuildRequires:	doxygen
+BuildRequires:	expat-devel
 BuildRequires:	faad2-devel >= 2.6.1-5
-BuildRequires:	ffmpeg-devel
-BuildRequires:	flac-devel >= 1.1.0
-BuildRequires:	fluidsynth-devel
+BuildRequires:	ffmpeg-devel >= 0.8.0
+BuildRequires:	flac-devel >= 1.2.0
+BuildRequires:	fluidsynth-devel >= 1.1
 BuildRequires:	game-music-emu-devel
-BuildRequires:	glib2-devel >= 2.12
-BuildRequires:	jack-audio-connection-kit-devel >= 0.4
+BuildRequires:	gcc >= 6:4.7
+BuildRequires:	glib2-devel >= 1:2.28.0
+BuildRequires:	jack-audio-connection-kit-devel >= 0.100
 BuildRequires:	lame-libs-devel
 BuildRequires:	libao-devel >= 0.8.3
 BuildRequires:	libcdio-devel
+BuildRequires:	libcdio-paranoia-devel
 BuildRequires:	libcue-devel
+BuildRequires:	libicu-devel
 BuildRequires:	libid3tag-devel
 BuildRequires:	libmad-devel
 %{?with_mod:BuildRequires:	libmikmod-devel >= 3.1.7}
-BuildRequires:	libmms-devel
+BuildRequires:	libmms-devel >= 0.4
 BuildRequires:	libmodplug-devel
-BuildRequires:	libmpcdec-devel
+BuildRequires:	libmpdclient-devel >= 2.2
+BuildRequires:	libmpg123-devel
+BuildRequires:	libnfs-devel
 BuildRequires:	libogg-devel
-BuildRequires:	libsamplerate-devel >= 0.0.15
+BuildRequires:	libsamplerate-devel >= 0.1.3
 BuildRequires:	libshout-devel
+BuildRequires:	libsidplay2-devel >= 2.1.1-5
+BuildRequires:	libsmbclient-devel >= 0.2
+BuildRequires:	libsndfile-devel
+BuildRequires:	libstdc++-devel >= 0.2
+BuildRequires:	libupnp-devel
 BuildRequires:	libvorbis-devel
+BuildRequires:	libwrap-devel
+BuildRequires:	musepack-devel
+BuildRequires:	opus-devel
 BuildRequires:	pkgconfig >= 1:0.9.0
-%{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
-BuildRequires:	sqlite3-devel
+%{?with_pulseaudio:BuildRequires:	pulseaudio-devel >= 0.9.16}
+BuildRequires:	rpmbuild(macros) >= 1.629-2
+BuildRequires:	shine-devel >= 3.1
+BuildRequires:	soxr-devel
+BuildRequires:	sqlite3-devel >= 3.7.3
+BuildRequires:	systemd-devel
 BuildRequires:	twolame-devel
 BuildRequires:	wavpack-devel
 BuildRequires:	wildmidi-devel
 BuildRequires:	xmlto
+BuildRequires:	yajl-devel >= 2.0
 BuildRequires:	zlib-devel
-BuildRequires:	zziplib-devel
+BuildRequires:	zziplib-devel >= 0.13
+Requires(post,postun):	gtk-update-icon-cache
+Requires(post,preun,postun):	systemd-units >= 38
+Requires:	alsa-lib >= 0.9.0
+%{?with_audiofile:Requires:	audiofile >= 0.3}
+Requires:	curl-libs >= 7.18
+Requires:	faad2-libs >= 2.6.1-5
+Requires:	ffmpeg-libs >= 0.8.0
+Requires:	flac >= 1.2.0
+Requires:	fluidsynth >= 1.1
+Requires:	glib2 >= 1:2.28.0
+Requires:	hicolor-icon-theme
+Requires:	jack-audio-connection-kit-libs >= 0.100
+Requires:	libao >= 0.8.3
+%{?with_mod:Requires:	libmikmod >= 3.1.7}
+Requires:	libmms >= 0.4
+Requires:	libmpdclient >= 2.2
+Requires:	libsamplerate >= 0.1.3
+Requires:	libsidplay2 >= 2.1.1-5
+Requires:	libsmbclient >= 0.2
+%{?with_pulseaudio:Requires:	pulseaudio-libs >= 0.9.16}
+Requires:	shine >= 3.1
+Requires:	sqlite3 >= 3.7.3
+Requires:	systemd-units >= 38
+Requires:	yajl >= 2.0
+Requires:	zziplib >= 0.13
 Provides:	group(mpd)
 Provides:	user(mpd)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -90,6 +140,9 @@ frontendów albo często restartujących X.
 Summary:	MPD API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki API
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 API and internal documentation for MPD library.
@@ -121,6 +174,10 @@ Dokumentacja do Music Player Daemon (MPD).
 %patch0 -p1
 
 %build
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 # ac_cv_* hacks to avoid unwanted linking
 GME_CFLAGS="-I/usr/include/gme" GME_LIBS="-lgme" \
 %configure \
@@ -128,46 +185,75 @@ GME_CFLAGS="-I/usr/include/gme" GME_LIBS="-lgme" \
 	ac_cv_lib_nsl_gethostbyname=no \
 	%{!?with_pulseaudio:--disable-pulse} \
 	%{?with_mod:--enable-mikmod} \
-	--disable-sidplay \
+	--enable-adplug \
 	--enable-alsa \
 	--enable-ao \
-	--enable-audiofile \
+	%{?with_audiofile:--enable-audiofile} \
 	--enable-bzip2 \
-	--enable-cue \
+	--enable-cdio-paranoia \
 	--enable-curl \
+	--enable-database \
 	--enable-documentation \
+	--enable-dsd \
+	--enable-expat \
 	--enable-ffmpeg \
+	--enable-fifo \
+	--enable-flac \
 	--enable-fluidsynth \
 	--enable-gme \
 	--enable-httpd-output \
+	--enable-icu \
+	--enable-id3 \
+	--enable-inotify \
+	--enable-ipv6 \
 	--enable-iso9660 \
 	--enable-jack \
 	--enable-lame-encoder \
-	--enable-lastfm \
+	--enable-libmpdclient \
+	--enable-libwrap \
 	--enable-lsr \
 	--enable-mad \
+	--enable-mikmod \
 	--enable-mms \
 	--enable-modplug \
-	--enable-mvp \
+	--enable-mpc \
+	--enable-nfs \
 	--enable-openal \
+	--enable-opus \
+	--enable-oss \
 	--enable-pipe-output \
 	--enable-recorder-output \
+	--enable-sidplay \
+	--enable-shine-encoder \
 	--enable-shout \
+	--enable-smbclient \
+	--enable-sndfile \
+	--enable-soundcloud \
+	--enable-soxr \
 	--enable-sqlite \
+	--enable-systemd-daemon \
+	--enable-tcp \
 	--enable-twolame-encoder \
+	--enable-upnp \
+	--enable-un \
+	--enable-vorbis \
 	--enable-vorbis-encoder \
 	--enable-wave-encoder \
 	--enable-wavpack \
 	--enable-wildmidi \
+	--enable-zlib \
 	--enable-zzip \
 	--with-zeroconf=avahi \
-	--without-tremor
+	--without-tremor \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
+	--with-systemduserunitdir=%{systemduserunitdir}
 %{__make}
 
 %install
 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{/var/lib/mpd/playlists,/var/log/mpd,/var/run/mpd} \
+	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -175,6 +261,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
 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
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 touch $RPM_BUILD_ROOT/var/lib/mpd/mpd.db
 touch $RPM_BUILD_ROOT/var/lib/mpd/mpdstate
@@ -188,7 +275,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -199,26 +286,38 @@ for f in mpd.log; do
 	fi
 done
 /sbin/chkconfig --add mpd
+%systemd_post %{name}.service %{name}.socket
+%update_icon_cache hicolor
 
 %preun
 if [ "$1" = "0" ]; then
 	%service mpd stop
 	/sbin/chkconfig --del mpd
 fi
+%systemd_preun %{name}.service %{name}.socket
 
 %postun
 if [ "$1" = "0" ]; then
 	%userremove mpd
 	%groupremove mpd
 fi
+%systemd_reload
+%update_icon_cache hicolor
+
+%triggerpostun -- %{name} < 0.16.6-1
+%systemd_trigger %{name}.service
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README doc/mpdconf.example UPGRADING
+%doc AUTHORS NEWS README.md doc/mpdconf.example
 %attr(755,root,root) %{_bindir}/*
 %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
+%{systemdtmpfilesdir}/%{name}.conf
+%{systemdunitdir}/mpd.service
+%{systemdunitdir}/mpd.socket
+%{systemduserunitdir}/mpd.service
 %dir %attr(770,root,mpd) /var/lib/%{name}
 %dir %attr(770,root,mpd) /var/lib/%{name}/playlists
 %dir %attr(751,root,root) /var/log/%{name}
@@ -227,6 +326,7 @@ fi
 %attr(644,mpd,mpd) %ghost /var/lib/%{name}/mpdstate
 %attr(644,mpd,mpd) %ghost /var/lib/%{name}/sticker.sql
 %attr(644,mpd,mpd) %ghost /var/log/%{name}/mpd.log
+%{_iconsdir}/hicolor/scalable/apps/mpd.svg
 %{_mandir}/man1/mpd.1*
 %{_mandir}/man5/mpd.conf.5*