Accepting request 572421 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/572421
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpd?expand=0&rev=2

mpd-0.20.14.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d59afa1e7aabe5f7ad2d66eb274b0d54568b4110a783dfe8e74bd0f94e3f781
-size 787944

mpd-0.20.16.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29e1676288e61a8bee6b687d23ba6ca42ccec4dc87c6a0e81d119aea27dcd06a
+size 790708

mpd.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+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
+
+- Adjust usage of gccN for Leap42 and SLE12
+
 -------------------------------------------------------------------
 Tue Jan  2 09:23:24 UTC 2018 - aloisio@gmx.com
 

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,30 +37,41 @@ 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++
 %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
-BuildRequires:  libcue-devel
+%endif
-BuildRequires:  libmikmod-devel
+#uildRequires:  cdrkit-cdrtools-compat
-# MPD_ENABLE_AUTO_LIB
-BuildRequires:  pkgconfig(bzip2)
 %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
@@ -102,14 +113,13 @@ BuildRequires:  pkgconfig(wavpack)
 #uildRequires:  pkgconfig(yajl) >= 2.0
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(zziplib) >= 0.13
-#
+Requires(pre):  %fillup_prereq
-%if %{suse_version} > 1320
+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
@@ -128,14 +138,14 @@ Please read README.mpd how to configure it.
 %patch1 -p1
 
 %build
-%if 0%{?suse_version} > 1320
 export CC=gcc
 export CXX=g++
-%else
+test -x "$(type -p gcc-5)" && export CC=gcc-5
-# Leap 42.2+ / SLE12SP2Backports
+test -x "$(type -p g++-5)" && export CXX=g++-5
-export CC=gcc-6
+test -x "$(type -p gcc-6)" && export CC=gcc-6
-export CXX=g++-6
+test -x "$(type -p g++-6)" && export CXX=g++-6
-%endif
+test -x "$(type -p gcc-7)" && export CC=gcc-7
+test -x "$(type -p g++-7)" && export CXX=g++-7
 NOCONFIGURE=1 ./autogen.sh
 %configure \
         --disable-sidplay \
@@ -225,8 +235,8 @@ NOCONFIGURE=1 ./autogen.sh
         \
         --with-boost=yes \
         --enable-systemd-daemon \
-        --with-systemdsystemunitdir=%_unitdir \
+        --with-systemdsystemunitdir=%{_unitdir} \
-        --with-systemduserunitdir=%_userunitdir
+        --with-systemduserunitdir=%{_userunitdir}
 make %{?_smp_mflags}
 
 %install
@@ -239,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
@@ -259,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}