- add systemd user service startup, rel 2

[packages/mpd.git] / mpd.spec

diff --git a/mpd.spec b/mpd.spec
index d1ce4d6be9c382a35e11a5107282b91b0bd6a919..adacc57e0f13986487b18b1149c7ba717aa5e802 100644 (file)
--- a/mpd.spec
+++ b/mpd.spec
@@ -9,17 +9,16 @@
 Summary:       Music Player Daemon
 Summary(pl.UTF-8):     Music Player Daemon - demon odtwarzający muzykę
 Name:          mpd
-Version:       0.23
-Release:       1
+Version:       0.23.5
+Release:       2
 License:       GPL v2+
 Group:         Applications/Multimedia
 Source0:       https://www.musicpd.org/download/mpd/0.23/%{name}-%{version}.tar.xz
-# Source0-md5: 103db74cc275ec0f7e5b7503cfd80131
+# Source0-md5: 624ff40f0f059fab58843ab90ce2bc9a
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
-Patch0:                smb.patch
 URL:           http://www.musicpd.org/
 BuildRequires: OpenAL-devel
 BuildRequires: adplug-devel
@@ -74,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
@@ -89,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 >= 250.1
 Requires:      alsa-lib >= 0.9.0
 %{?with_audiofile:Requires:    audiofile >= 0.3}
 Requires:      curl-libs >= 7.33
@@ -99,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
@@ -118,9 +116,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 >= 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)
@@ -170,9 +169,22 @@ 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
-%patch0 -p1
 
 %build
 %meson build \
@@ -277,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
@@ -285,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
@@ -292,6 +308,8 @@ if [ "$1" = "0" ]; then
        %groupremove mpd
 fi
 %systemd_reload
+
+%postun icons
 %update_icon_cache hicolor
 
 %triggerpostun -- %{name} < 0.16.6-1
@@ -317,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