commit 759661fff96e2ceeff05c7f5eb575e6aa90bcb18
Author: Jan Palus <[email protected]>
Date: Thu Sep 21 18:55:54 2017 +0200
up to 0.28
- build switched to meson
- disable lirc (our lirc is broken? either lirc.pc should link against
lirc_client or there should be lirc_client.pc)
ax_require_defined.m4 | 37 -------------------------------------
ncmpc.spec | 50 +++++++++++++++++++++-----------------------------
2 files changed, 21 insertions(+), 66 deletions(-)
---
diff --git a/ncmpc.spec b/ncmpc.spec
index 1018e5d..d61b55d 100644
--- a/ncmpc.spec
+++ b/ncmpc.spec
@@ -1,21 +1,21 @@
Summary: Curses client for Music Player Daemon
Summary(pl.UTF-8): Klient curses dla demona MPD
Name: ncmpc
-Version: 0.27
+Version: 0.28
Release: 1
License: GPL v2+
Group: Applications/Sound
Source0:
http://www.musicpd.org/download/ncmpc/0/%{name}-%{version}.tar.xz
-# Source0-md5: 121c99645fa2ba6dc86db28a46944ebb
-Source1: ax_require_defined.m4
+# Source0-md5: 1fdfb8b5d72434fb48ebc4fbc5ac89c7
URL: http://mpd.wikia.com/wiki/Client:Ncmpc
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.11
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.30
BuildRequires: libmpdclient-devel >= 2.9
+BuildRequires: meson
BuildRequires: ncurses-devel
+BuildRequires: ninja
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.725
Requires: glib2 >= 1:2.30
Requires: libmpdclient >= 2.9
Suggests: mpd
@@ -37,35 +37,27 @@ playlistami i sterowania MPD za pomocą pilota.
%prep
%setup -q
-%{__cp} %{SOURCE1} m4
%build
-%{__glib_gettextize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-
-%configure \
- --enable-artist-screen \
- --enable-chat-screen \
- --enable-colors \
- --enable-help-screen \
- --enable-key-screen \
- --enable-locale \
- --enable-lyrics-screen \
- --enable-mouse \
- --enable-outputs-screen \
- --enable-search-screen \
- --enable-song-screen \
- --with-lyrics-plugin-dir=%{_libdir}/ncmpc/lyrics
-%{__make}
+%meson build \
+ -Dartist_screen=true \
+ -Dchat_screen=true \
+ -Dcolors=auto \
+ -Dhelp_screen=true \
+ -Dkey_screen=true \
+ -Dlocale=true \
+ -Dlyrics_screen=true \
+ -Dmouse=true \
+ -Doutputs_screen=true \
+ -Dsearch_screen=true \
+ -Dsong_screen=true \
+ -Dlirc=false
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+DESTDIR=$RPM_BUILD_ROOT \
+%ninja -C build install
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -76,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f ncmpc.lang
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README doc/*.sample doc/ncmpc.lirc
+%doc AUTHORS NEWS README.rst doc/*.sample doc/ncmpc.lirc
%attr(755,root,root) %{_bindir}/*
%dir %{_libdir}/ncmpc
%dir %{_libdir}/ncmpc/lyrics
diff --git a/ax_require_defined.m4 b/ax_require_defined.m4
deleted file mode 100644
index cae1111..0000000
--- a/ax_require_defined.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-# been defined and thus are available for use. This avoids random issues
-# where a macro isn't expanded. Instead the configure script emits a
-# non-fatal:
-#
-# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-# It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-# Here's an example:
-#
-# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-# Copyright (c) 2014 Mike Frysinger <[email protected]>
-#
-# Copying and distribution of this file, with or without modification, are
-# permitted in any medium without royalty provided the copyright notice
-# and this notice are preserved. This file is offered as-is, without any
-# warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
- m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file
missing?])])
-])dnl AX_REQUIRE_DEFINED
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ncmpc.git/commitdiff/759661fff96e2ceeff05c7f5eb575e6aa90bcb18
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
