Packman Build Service PMBS

Changes of Revision 9

ncmpc.spec Changed

@@ -25,7 +25,11 @@
 Patch3:         ncmpc-fix_meson_docdir.patch
 URL:            http://mpd.wikia.com/wiki/Client:Ncmpc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%if %{suse_version} > 1500
+BuildRequires:  gcc-c++
+%else
 BuildRequires:  gcc7-c++
+%endif
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(glib-2.0) >= 2.30
@@ -46,6 +50,7 @@
 %patch2
 %patch3
 
+%build
 export PKG_CONFIG_PATH="$PWD/pc:$PKG_CONFIG_PATH"
 mkdir pc
 cat<<EOF > pc/ncursesw.pc
@@ -57,9 +62,13 @@
 Description: ncursesw
 Libs: -L\${libdir} -lncursesw
 EOF
+test -n "$(type -p g++)"   && CXX=$_
+test -n "$(type -p g++-7)" && CXX=$_
 
-CXX=g++-7 \
-meson configure \
+CXX="${CXX}" \
+meson \
+    --prefix '%{_prefix}' \
+    --buildtype debug \
     -Dcurses=ncursesw \
     -Dmouse=true \
     -Dcolors=ncursesw \
@@ -68,17 +77,11 @@
     -Dnls=true \
     -Dlirc=false \
     -Dtcp=true \
-    -Ddocumentation=false
-
-CXX=g++-7 \
-meson \
-    --prefix '%{_prefix}' \
-    --buildtype debug \
+    -Ddocumentation=false \
     . \
     output
 
-%build
-CXX=g++-7 \
+CXX="${CXX}" \
 ninja -C output %{?_smp_mflags} -v
 
 %install
@@ -92,9 +95,6 @@
 %__install -D -m 644 doc/keys.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/keys
 %__install -D -m 644 doc/config.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files lang -f %{name}.lang
 %defattr(-,root,root)