From 7b0c54666e6b393a15e6d8f6d52f2b5db9e29214563009cf7bd5af4af6ad92bb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 19 Aug 2020 09:18:10 +0000 Subject: [PATCH 1/2] Accepting request 827780 from home:dimstar:Factory - Use %{_userunitdir} consistently in the spec file. OBS-URL: https://build.opensuse.org/request/show/827780 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=57 --- mpd.changes | 5 +++++ mpd.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mpd.changes b/mpd.changes index c2354c9..a055780 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 19 09:12:04 UTC 2020 - Dominique Leuenberger + +- Use %{_userunitdir} consistently in the spec file. + ------------------------------------------------------------------- Tue Jul 7 06:32:18 UTC 2020 - Paolo Stivanin diff --git a/mpd.spec b/mpd.spec index 74c3e90..076ec33 100644 --- a/mpd.spec +++ b/mpd.spec @@ -218,8 +218,8 @@ install -d \ install -m 0644 %{SOURCE1} README.mpd cp -a "%{SOURCE2}" "%{buildroot}%{_docdir}/%{name}/" ln -s service %{buildroot}%{_sbindir}/rcmpd -rm %{buildroot}%{_libexecdir}/systemd/user/mpd.socket -ln -s ../system/mpd.socket %{buildroot}%{_libexecdir}/systemd/user/mpd.socket +rm %{buildroot}%{_userunitdir}/mpd.socket +ln -s ../system/mpd.socket %{buildroot}%%{_userunitdir/mpd.socket %pre # add mpd user only when installing first time @@ -249,7 +249,7 @@ getent passwd mpd >/dev/null || useradd -r -g audio -d %{_localstatedir}/lib/mpd %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_unitdir}/mpd.service %{_unitdir}/mpd.socket -%{_libexecdir}/systemd/user/mpd.socket +%{_userunitdir}/mpd.socket %{_userunitdir}/mpd.service %changelog From 0c215b776c1ed3589dfb7af3b6b69cea2c35f7ce34eab7642fe6016eab30b26b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 19 Aug 2020 12:44:13 +0000 Subject: [PATCH 2/2] Accepting request 827869 from home:dimstar:Factory Fix typo - sorry for the noise OBS-URL: https://build.opensuse.org/request/show/827869 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=58 --- mpd.changes | 5 +++++ mpd.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mpd.changes b/mpd.changes index a055780..b8f2879 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 19 11:40:13 UTC 2020 - Dominique Leuenberger + +- Fix typo in previous commit. + ------------------------------------------------------------------- Wed Aug 19 09:12:04 UTC 2020 - Dominique Leuenberger diff --git a/mpd.spec b/mpd.spec index 076ec33..6a93364 100644 --- a/mpd.spec +++ b/mpd.spec @@ -219,7 +219,7 @@ install -m 0644 %{SOURCE1} README.mpd cp -a "%{SOURCE2}" "%{buildroot}%{_docdir}/%{name}/" ln -s service %{buildroot}%{_sbindir}/rcmpd rm %{buildroot}%{_userunitdir}/mpd.socket -ln -s ../system/mpd.socket %{buildroot}%%{_userunitdir/mpd.socket +ln -s ../system/mpd.socket %{buildroot}%{_userunitdir}/mpd.socket %pre # add mpd user only when installing first time