From d03c1a3f54c4f523c08b2734fb4e421f20815a68eb56e5414941a946aad37668 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 31 Jan 2018 10:46:40 +0000 Subject: [PATCH 1/4] - Adjust usage of gccN for Leap42 and SLE12 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=5 --- mpd.changes | 5 +++++ mpd.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mpd.changes b/mpd.changes index 456f546..79ceb72 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 31 10:42:14 UTC 2018 - olaf@aepfle.de + +- Adjust usage of gccN for Leap42 and SLE12 + ------------------------------------------------------------------- Tue Jan 2 09:23:24 UTC 2018 - aloisio@gmx.com diff --git a/mpd.spec b/mpd.spec index 8f57f9e..3f59cee 100644 --- a/mpd.spec +++ b/mpd.spec @@ -44,9 +44,15 @@ BuildRequires: libboost_headers-devel BuildRequires: gcc BuildRequires: gcc-c++ %else -# Leap 42.2+ / SLE12SP2Backports +%if 0%{?sle_version} == 120200 +# Leap 42.2 BuildRequires: gcc6 BuildRequires: gcc6-c++ +%else +# Leap 42.3+ / SLE12SP3Backports +BuildRequires: gcc7 +BuildRequires: gcc7-c++ +%endif %endif BuildRequires: libcue-devel BuildRequires: libmikmod-devel From f8038af1232e6057986977b41969ffd8825e74cf6a464793e32271a8fb4965e0 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 31 Jan 2018 10:51:06 +0000 Subject: [PATCH 2/4] correct g++ detection OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=6 --- mpd.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mpd.spec b/mpd.spec index 3f59cee..2968917 100644 --- a/mpd.spec +++ b/mpd.spec @@ -134,14 +134,14 @@ Please read README.mpd how to configure it. %patch1 -p1 %build -%if 0%{?suse_version} > 1320 export CC=gcc export CXX=g++ -%else -# Leap 42.2+ / SLE12SP2Backports -export CC=gcc-6 -export CXX=g++-6 -%endif +test -x "$(type -p gcc-5)" && export CC=gcc-5 +test -x "$(type -p g++-5)" && export CC=g++-5 +test -x "$(type -p gcc-6)" && export CC=gcc-6 +test -x "$(type -p g++-6)" && export CC=g++-6 +test -x "$(type -p gcc-7)" && export CC=gcc-7 +test -x "$(type -p g++-7)" && export CC=g++-7 NOCONFIGURE=1 ./autogen.sh %configure \ --disable-sidplay \ From b69c7ec795a8188ebbd9045949c9e539618a6b9d714bad7ca701e8206c6a277e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 31 Jan 2018 10:55:28 +0000 Subject: [PATCH 3/4] typo in CXX OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=7 --- mpd.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpd.spec b/mpd.spec index 2968917..cfa14b9 100644 --- a/mpd.spec +++ b/mpd.spec @@ -137,11 +137,11 @@ Please read README.mpd how to configure it. export CC=gcc export CXX=g++ test -x "$(type -p gcc-5)" && export CC=gcc-5 -test -x "$(type -p g++-5)" && export CC=g++-5 +test -x "$(type -p g++-5)" && export CXX=g++-5 test -x "$(type -p gcc-6)" && export CC=gcc-6 -test -x "$(type -p g++-6)" && export CC=g++-6 +test -x "$(type -p g++-6)" && export CXX=g++-6 test -x "$(type -p gcc-7)" && export CC=gcc-7 -test -x "$(type -p g++-7)" && export CC=g++-7 +test -x "$(type -p g++-7)" && export CXX=g++-7 NOCONFIGURE=1 ./autogen.sh %configure \ --disable-sidplay \ From 63b009da1c470212dc30fd2fd38e476234ab83e1e4ec22a77c72111d35df6d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 4 Feb 2018 14:26:38 +0000 Subject: [PATCH 4/4] Accepting request 572416 from home:mnhauke - Update to version 0.20.16: * output - pulse: fix crash during auto-detection * database - simple: fix search within mount points - upnp: enable IPv6 * archive - iso9660: libcdio 2.0 compatibility - Update to version 0.20.15: * queue: fix crash after seek failure * resampler - soxr: clear internal state after manual song change * state file - make mount point restore errors non-fatal - fix crash when restoring mounts with incompatible database plugin - Run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/572416 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=8 --- mpd-0.20.14.tar.xz | 3 --- mpd-0.20.16.tar.xz | 3 +++ mpd.changes | 23 +++++++++++++++++++++++ mpd.spec | 46 +++++++++++++++++++++++++--------------------- 4 files changed, 51 insertions(+), 24 deletions(-) delete mode 100644 mpd-0.20.14.tar.xz create mode 100644 mpd-0.20.16.tar.xz diff --git a/mpd-0.20.14.tar.xz b/mpd-0.20.14.tar.xz deleted file mode 100644 index 9194b4b..0000000 --- a/mpd-0.20.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d59afa1e7aabe5f7ad2d66eb274b0d54568b4110a783dfe8e74bd0f94e3f781 -size 787944 diff --git a/mpd-0.20.16.tar.xz b/mpd-0.20.16.tar.xz new file mode 100644 index 0000000..5322765 --- /dev/null +++ b/mpd-0.20.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29e1676288e61a8bee6b687d23ba6ca42ccec4dc87c6a0e81d119aea27dcd06a +size 790708 diff --git a/mpd.changes b/mpd.changes index 79ceb72..7518260 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun Feb 4 09:26:45 UTC 2018 - mardnh@gmx.de + +- Update to version 0.20.16: + * output + - pulse: fix crash during auto-detection + * database + - simple: fix search within mount points + - upnp: enable IPv6 + * archive + - iso9660: libcdio 2.0 compatibility + +- Update to version 0.20.15: + * queue: fix crash after seek failure + * resampler + - soxr: clear internal state after manual song change + * state file + - make mount point restore errors non-fatal + - fix crash when restoring mounts with incompatible database + plugin + +- Run spec-cleaner + ------------------------------------------------------------------- Wed Jan 31 10:42:14 UTC 2018 - olaf@aepfle.de diff --git a/mpd.spec b/mpd.spec index cfa14b9..2e5689e 100644 --- a/mpd.spec +++ b/mpd.spec @@ -20,15 +20,15 @@ %bcond_with faad %if !%{defined _userunitdir} -%define _userunitdir /usr/lib/systemd/user +%define _userunitdir %{_prefix}/lib/systemd/user %endif Name: mpd -Version: 0.20.14 +Version: 0.20.16 Release: 0 Summary: Music Player Daemon License: GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -URL: https://www.musicpd.org/ +Url: https://www.musicpd.org/ Source: https://www.musicpd.org/download/mpd/0.20/mpd-%{version}.tar.xz Source2: README.%{name} Source3: mpd-user.conf @@ -37,9 +37,11 @@ Patch0: %{name}-mpdconf_suse.patch Patch1: mpd-configh.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: pkg-config +%if 0%{?suse_version} > 1315 BuildRequires: libboost_headers-devel -#uildRequires: cdrkit-cdrtools-compat +%else +BuildRequires: boost-devel +%endif %if 0%{?suse_version} > 1320 BuildRequires: gcc BuildRequires: gcc-c++ @@ -54,19 +56,22 @@ BuildRequires: gcc7 BuildRequires: gcc7-c++ %endif %endif -BuildRequires: libcue-devel -BuildRequires: libmikmod-devel -# MPD_ENABLE_AUTO_LIB -BuildRequires: pkgconfig(bzip2) +#uildRequires: cdrkit-cdrtools-compat %if %{with faad} BuildRequires: faad2-devel %endif +# +BuildRequires: libcue-devel +BuildRequires: libmikmod-devel BuildRequires: libmp3lame-devel +BuildRequires: pkgconfig # MPD_ENABLE_AUTO_PKG BuildRequires: pkgconfig(alsa) >= 0.9.0 BuildRequires: pkgconfig(ao) BuildRequires: pkgconfig(audiofile) >= 0.3 BuildRequires: pkgconfig(avahi-client) +# MPD_ENABLE_AUTO_LIB +BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(flac) >= 1.2 @@ -108,14 +113,13 @@ BuildRequires: pkgconfig(wavpack) #uildRequires: pkgconfig(yajl) >= 2.0 BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zziplib) >= 0.13 -# -%if %{suse_version} > 1320 -BuildRequires: group(audio) -Requires(pre): group(audio) +Requires(pre): %fillup_prereq +Requires(pre): pwdutils +Requires(pre): shadow +%if 0%{?suse_version} > 1320 +BuildRequires: group(audio) +Requires(pre): group(audio) %endif -Requires(pre): pwdutils -Requires(pre): shadow -Requires(pre): %fillup_prereq %{?systemd_requires} %description @@ -231,8 +235,8 @@ NOCONFIGURE=1 ./autogen.sh \ --with-boost=yes \ --enable-systemd-daemon \ - --with-systemdsystemunitdir=%_unitdir \ - --with-systemduserunitdir=%_userunitdir + --with-systemdsystemunitdir=%{_unitdir} \ + --with-systemduserunitdir=%{_userunitdir} make %{?_smp_mflags} %install @@ -245,13 +249,13 @@ install -d \ # additional docs install -m 0644 %{SOURCE2} README.mpd # copy example mpd.conf -install -Dm0644 %{buildroot}%{_docdir}/%{name}/mpdconf.example %{buildroot}/etc/mpd.conf +install -Dm0644 %{buildroot}%{_docdir}/%{name}/mpdconf.example %{buildroot}%{_sysconfdir}/mpd.conf cp -a "%{SOURCE3}" "%{buildroot}%{_docdir}/%{name}/" ln -s service %{buildroot}%{_sbindir}/rcmpd %pre # add mpd user only when installing first time -getent passwd mpd >/dev/null || useradd -r -g audio -d /var/lib/mpd -s /sbin/nologin -c "user for mpd" mpd +getent passwd mpd >/dev/null || useradd -r -g audio -d %{_localstatedir}/lib/mpd -s /sbin/nologin -c "user for mpd" mpd %service_add_pre mpd.service %post @@ -265,7 +269,7 @@ getent passwd mpd >/dev/null || useradd -r -g audio -d /var/lib/mpd -s /sbin/nol %files %doc AUTHORS COPYING NEWS README.md README.mpd -%config(noreplace) /etc/%{name}.conf +%config(noreplace) %{_sysconfdir}/%{name}.conf %{_bindir}/%{name} %{_sbindir}/rcmpd %attr(0755,mpd,audio) %{_localstatedir}/lib/%{name}