X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmpd.git;a=blobdiff_plain;f=mpd.spec;h=f30f2feb9f245193e9c865a3ce0db512f50eae94;hp=5ae4ee6e6bd2be32da9aa1dee4f5d51b248ba0ba;hb=4ae0a2da21b8f05a46100e48b87e95e4ee2f2c04;hpb=b3e4653b1d852f2e4e7d43bc9177a1c25cb06e5b

diff --git a/mpd.spec b/mpd.spec
index 5ae4ee6..f30f2fe 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.23.2
+Version:	0.23.10
 Release:	1
 License:	GPL v2+
 Group:		Applications/Multimedia
 Source0:	https://www.musicpd.org/download/mpd/0.23/%{name}-%{version}.tar.xz
-# Source0-md5:	d30fbe61065c564c18a7a38bd3a7cc82
+# Source0-md5:	d96071f23c28b3de56b8a83dcc7ec2ab
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -57,7 +57,7 @@ BuildRequires:	libnfs-devel >= 1.11
 BuildRequires:	libogg-devel
 BuildRequires:	libopenmpt-devel >= 0.5
 BuildRequires:	libsamplerate-devel >= 0.1.3
-BuildRequires:	libshout-devel
+BuildRequires:	libshout-devel >= 2.4.6
 BuildRequires:	libsidplayfp-devel >= 1.8
 BuildRequires:	libsmbclient-devel >= 0.2
 BuildRequires:	libsndfile-devel
@@ -73,7 +73,8 @@ 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.736
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 2.011
 BuildRequires:	shine-devel >= 3.1
 BuildRequires:	soxr-devel
 BuildRequires:	sphinx-pdg
@@ -88,8 +89,7 @@ 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 >= 1:250.1
 Requires:	alsa-lib >= 0.9.0
 %{?with_audiofile:Requires:	audiofile >= 0.3}
 Requires:	curl-libs >= 7.33
@@ -98,7 +98,6 @@ 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.93
@@ -110,6 +109,7 @@ Requires:	libmpg123 >= 1.28.0
 Requires:	libnfs >= 1.11
 Requires:	libopenmpt >= 0.5
 Requires:	libsamplerate >= 0.1.3
+Requires:	libshout >= 2.4.6
 Requires:	libsidplayfp >= 1.8
 Requires:	libsmbclient >= 0.2
 Requires:	libupnp >= 1.8
@@ -117,9 +117,10 @@ 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 >= 1: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)
@@ -169,6 +170,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
 
@@ -275,6 +290,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
@@ -283,6 +301,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
@@ -290,6 +309,8 @@ if [ "$1" = "0" ]; then
 	%groupremove mpd
 fi
 %systemd_reload
+
+%postun icons
 %update_icon_cache hicolor
 
 %triggerpostun -- %{name} < 0.16.6-1
@@ -315,10 +336,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