X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mpd.spec;h=5dd832205aca39fbca32fbaa0fea9c959e938ec1;hb=57ad8ea76fd5abbf4a4eab63633a353074f5d575;hp=61865b9b6bbf75265fedec3e82b0ae0cbd163712;hpb=5ce9dcc9d8a478ea9c64bce0461509d18b2cd0bc;p=packages%2Fmpd.git

diff --git a/mpd.spec b/mpd.spec
index 61865b9..5dd8322 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -9,12 +9,12 @@
 Summary:	Music Player Daemon
 Summary(pl.UTF-8):	Music Player Daemon - demon odtwarzający muzykę
 Name:		mpd
-Version:	0.21
-Release:	1
+Version:	0.23.5
+Release:	5
 License:	GPL v2+
 Group:		Applications/Multimedia
-Source0:	http://www.musicpd.org/download/mpd/0.21/%{name}-%{version}.tar.xz
-# Source0-md5:	7a5bf4c4ea5b4fa03b8485608db371a7
+Source0:	https://www.musicpd.org/download/mpd/0.23/%{name}-%{version}.tar.xz
+# Source0-md5:	624ff40f0f059fab58843ab90ce2bc9a
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -27,7 +27,7 @@ BuildRequires:	alsa-lib-devel >= 0.9.0
 BuildRequires:	avahi-devel
 BuildRequires:	boost-devel >= 1.58
 BuildRequires:	bzip2-devel
-BuildRequires:	curl-devel >= 7.18
+BuildRequires:	curl-devel >= 7.33
 BuildRequires:	dbus-devel
 BuildRequires:	doxygen
 BuildRequires:	expat-devel
@@ -36,80 +36,90 @@ BuildRequires:	ffmpeg-devel >= 2.4.0
 BuildRequires:	flac-devel >= 1.2.0
 BuildRequires:	fluidsynth-devel >= 1.1
 BuildRequires:	game-music-emu-devel
-BuildRequires:	gcc >= 6:5
+BuildRequires:	gcc >= 6:8
 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 >= 0.4
-BuildRequires:	libcue-devel
+BuildRequires:	libcdio-paranoia-devel >= 0.93
+BuildRequires:	libchromaprint-devel
+BuildRequires:	libfmt-devel
 BuildRequires:	libicu-devel >= 50
 BuildRequires:	libid3tag-devel
 BuildRequires:	libmad-devel
 %{?with_mod:BuildRequires:	libmikmod-devel >= 3.2}
 BuildRequires:	libmms-devel >= 0.4
 BuildRequires:	libmodplug-devel
-BuildRequires:	libmpdclient-devel >= 2.9
-BuildRequires:	libmpg123-devel
+BuildRequires:	libmpdclient-devel >= 2.11
+BuildRequires:	libmpg123-devel >= 1.28.0
 BuildRequires:	libnfs-devel >= 1.11
 BuildRequires:	libogg-devel
+BuildRequires:	libopenmpt-devel >= 0.5
 BuildRequires:	libsamplerate-devel >= 0.1.3
 BuildRequires:	libshout-devel
-BuildRequires:	libsidplay2-devel >= 2.1.1-5
+BuildRequires:	libsidplayfp-devel >= 1.8
 BuildRequires:	libsmbclient-devel >= 0.2
 BuildRequires:	libsndfile-devel
-BuildRequires:	libstdc++-devel >= 0.2
-BuildRequires:	libupnp-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	libupnp-devel >= 1.8
+BuildRequires:	liburing-devel
 BuildRequires:	libvorbis-devel
-BuildRequires:	libwrap-devel
-BuildRequires:	meson >= 0.47
+BuildRequires:	meson >= 0.56.0
 BuildRequires:	musepack-devel
 BuildRequires:	ninja
 BuildRequires:	opus-devel
+BuildRequires:	pcre-devel
+BuildRequires:	pipewire-devel >= 0.3
 BuildRequires:	pkgconfig >= 1:0.9.0
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel >= 0.9.16}
-BuildRequires:	rpmbuild(macros) >= 1.727
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 2.011
 BuildRequires:	shine-devel >= 3.1
 BuildRequires:	soxr-devel
 BuildRequires:	sphinx-pdg
 BuildRequires:	sqlite3-devel >= 3.7.3
 BuildRequires:	systemd-devel
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	twolame-devel
 BuildRequires:	wavpack-devel
 BuildRequires:	wildmidi-devel
 BuildRequires:	xmlto
+BuildRequires:	xz
 BuildRequires:	yajl-devel >= 2.0
 BuildRequires:	zlib-devel
 BuildRequires:	zziplib-devel >= 0.13
-Requires(post,postun):	gtk-update-icon-cache
-Requires(post,preun,postun):	systemd-units >= 38
+Requires(post,preun,postun):	systemd-units >= 250.1
 Requires:	alsa-lib >= 0.9.0
 %{?with_audiofile:Requires:	audiofile >= 0.3}
-Requires:	curl-libs >= 7.18
+Requires:	curl-libs >= 7.33
 Requires:	faad2-libs >= 2.6.1-5
 Requires:	ffmpeg-libs >= 2.4.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
-Requires:	libcdio-paranoia >= 0.4
+Requires:	libcdio-paranoia >= 0.93
 Requires:	libicu >= 50
 %{?with_mod:Requires:	libmikmod >= 3.2}
 Requires:	libmms >= 0.4
-Requires:	libmpdclient >= 2.9
+Requires:	libmpdclient >= 2.11
+Requires:	libmpg123 >= 1.28.0
 Requires:	libnfs >= 1.11
+Requires:	libopenmpt >= 0.5
 Requires:	libsamplerate >= 0.1.3
-Requires:	libsidplay2 >= 2.1.1-5
+Requires:	libsidplayfp >= 1.8
 Requires:	libsmbclient >= 0.2
+Requires:	libupnp >= 1.8
+Requires:	pipewire-libs >= 0.3
 %{?with_pulseaudio:Requires:	pulseaudio-libs >= 0.9.16}
 Requires:	shine >= 3.1
 Requires:	sqlite3 >= 3.7.3
-Requires:	systemd-units >= 38
+Requires:	systemd-units >= 250.1
 Requires:	yajl >= 2.0
 Requires:	zziplib >= 0.13
+Suggests:	%{name}-icons
 Provides:	group(mpd)
 Provides:	user(mpd)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -159,6 +169,20 @@ Documentazione di Music Player Daemon (MPD).
 %description doc -l pl.UTF-8
 Dokumentacja do Music Player Daemon (MPD).
 
+%package icons
+Summary:	Icon files for Music Player Daemon (MPD)
+Summary(pl.UTF-8):	Pliki ikon dla Music Player Daemon (MPD)
+Group:		Applications
+Requires(post,postun):	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
+BuildArch:	noarch
+
+%description icons
+Documentation for Music Player Daemon (MPD).
+
+%description icons -l pl.UTF-8
+Pliki ikon dla Music Player Daemon (MPD).
+
 %prep
 %setup -q
 
@@ -171,10 +195,10 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Dao=enabled \
 	-Daudiofile=%{?with_audiofile:enabled}%{!?with_audiofile:disabled} \
 	-Dbzip2=enabled \
-	-Dcdio-paranoia=enabled \
+	-Dcdio_paranoia=enabled \
 	-Dcurl=enabled \
 	-Ddatabase=true \
-	-Ddocumentation=true \
+	-Ddocumentation=enabled \
 	-Ddsd=true \
 	-Dexpat=enabled \
 	-Dffmpeg=enabled \
@@ -184,15 +208,14 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Dgme=enabled \
 	-Dhttpd=true \
 	-Dicu=enabled \
-	-Did3=enabled \
+	-Did3tag=enabled \
 	-Dinotify=true \
+	-Dio_uring=enabled \
 	-Dipv6=enabled \
 	-Diso9660=enabled \
 	-Djack=enabled \
-	-Dlame-encoder=enabled \
+	-Dlame=enabled \
 	-Dlibmpdclient=enabled \
-	-Dlibwrap=enabled \
-	-Dlsr=enabled \
 	-Dmad=enabled \
 	-Dmikmod=enabled \
 	-Dmms=enabled \
@@ -205,7 +228,7 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Dpipe=true \
 	-Drecorder=true \
 	-Dsidplay=enabled \
-	-Dshine-encoder=enabled \
+	-Dshine=enabled \
 	-Dshout=enabled \
 	-Dsmbclient=enabled \
 	-Dsndfile=enabled \
@@ -215,11 +238,10 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Ddaemon=true \
 	-Dsystemd=enabled \
 	-Dtcp=true \
-	-Dtwolame-encoder=enabled \
-	-Dupnp=enabled \
-	-Dun=enabled \
+	-Dtwolame=enabled \
+	-Dupnp=pupnp \
 	-Dvorbis=enabled \
-	-Dvorbis-encoder=enabled \
+	-Dvorbisenc=enabled \
 	-Dwave_encoder=true \
 	-Dwavpack=enabled \
 	-Dwildmidi=enabled \
@@ -228,7 +250,7 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Dzeroconf=avahi \
 	-Dsystemd_system_unit_dir=%{systemdunitdir} \
 	-Dsystemd_user_unit_dir=%{systemduserunitdir}
-%meson_build -C build
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -236,7 +258,7 @@ 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%{systemdtmpfilesdir}
 
-%meson_install -C build
+%ninja_install -C build
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mpd
@@ -267,6 +289,9 @@ for f in mpd.log; do
 done
 /sbin/chkconfig --add mpd
 %systemd_post %{name}.service %{name}.socket
+%systemd_user_post %{name}.service %{name}.socket
+
+%post icons
 %update_icon_cache hicolor
 
 %preun
@@ -275,6 +300,7 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del mpd
 fi
 %systemd_preun %{name}.service %{name}.socket
+%systemd_user_preun %{name}.service %{name}.socket
 
 %postun
 if [ "$1" = "0" ]; then
@@ -282,6 +308,8 @@ if [ "$1" = "0" ]; then
 	%groupremove mpd
 fi
 %systemd_reload
+
+%postun icons
 %update_icon_cache hicolor
 
 %triggerpostun -- %{name} < 0.16.6-1
@@ -298,6 +326,7 @@ fi
 %{systemdunitdir}/mpd.service
 %{systemdunitdir}/mpd.socket
 %{systemduserunitdir}/mpd.service
+%{systemduserunitdir}/mpd.socket
 %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}
@@ -306,10 +335,13 @@ 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*
 
 %files doc
 %defattr(644,root,root,755)
 %doc build/doc/html
+
+%files icons
+%defattr(644,root,root,755)
+%{_iconsdir}/hicolor/scalable/apps/mpd.svg