[packages/ncmpc] - updated to 0.24 - updated source url - updated BRs - tinfo patch no longer needed - provided missi
atler
atler at pld-linux.org
Tue Jul 15 20:31:28 CEST 2014
commit b2b81a4264e75ba2927f9061e00156299da2ccd8
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Jul 15 20:29:13 2014 +0200
- updated to 0.24
- updated source url
- updated BRs
- tinfo patch no longer needed
- provided missing AX_REQUIRE_DEFINED macro
- explicitly enable features
ax_require_defined.m4 | 37 +++++++++++++++++++++++++++++++++++++
ncmpc-tinfo.patch | 11 -----------
ncmpc.spec | 37 ++++++++++++++++++++++---------------
3 files changed, 59 insertions(+), 26 deletions(-)
---
diff --git a/ncmpc.spec b/ncmpc.spec
index b38352d..3ec9192 100644
--- a/ncmpc.spec
+++ b/ncmpc.spec
@@ -1,23 +1,21 @@
Summary: Curses client for Music Player Daemon
Summary(pl.UTF-8): Klient curses dla demona MPD
Name: ncmpc
-Version: 0.18
-Release: 2
+Version: 0.24
+Release: 1
License: GPL v2+
Group: Applications/Sound
-Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
-# Source0-md5: 9f07e8289b710c7c41b3c80ba73fed76
-Patch0: %{name}-tinfo.patch
+Source0: http://www.musicpd.org/download/ncmpc/0/%{name}-%{version}.tar.xz
+# Source0-md5: 0717193f38446780372f2a8907316362
+Source1: ax_require_defined.m4
URL: http://mpd.wikia.com/wiki/Client:Ncmpc
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.11
BuildRequires: gettext-devel
-BuildRequires: glib2-devel
-BuildRequires: libmpdclient-devel
-BuildRequires: libtool
-BuildRequires: ncurses-ext-devel
+BuildRequires: glib2-devel >= 1:2.14
+BuildRequires: libmpdclient-devel >= 2.5
+BuildRequires: ncurses-devel
BuildRequires: pkgconfig
-BuildRequires: rpm-pythonprov
Suggests: mpd
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,18 +35,27 @@ playlistami i sterowania MPD za pomocą pilota.
%prep
%setup -q
-%patch0 -p1
+%{__cp} %{SOURCE1} m4
%build
-%{__libtoolize}
+%{__glib_gettextize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- CPPFLAGS="-I/usr/include/ncurses" \
+ --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}
diff --git a/ax_require_defined.m4 b/ax_require_defined.m4
new file mode 100644
index 0000000..cae1111
--- /dev/null
+++ b/ax_require_defined.m4
@@ -0,0 +1,37 @@
+# ===========================================================================
+# 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 <vapier at gentoo.org>
+#
+# 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
diff --git a/ncmpc-tinfo.patch b/ncmpc-tinfo.patch
deleted file mode 100644
index cedec63..0000000
--- a/ncmpc-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ncmpc-0.17/configure.ac~ 2010-07-15 04:03:15.000000000 +0200
-+++ ncmpc-0.17/configure.ac 2010-07-19 15:25:53.550308463 +0200
-@@ -98,7 +98,7 @@
-
- AC_CHECK_LIB([$ncurses],
- [initscr],
-- [LIBS="$LIBS -l$ncurses"],
-+ [LIBS="$LIBS -l$ncurses -ltinfo"],
- [AC_MSG_ERROR($ncurses library is required)])
-
- if test "x$ncurses" = "xncursesw"; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ncmpc.git/commitdiff/b2b81a4264e75ba2927f9061e00156299da2ccd8
More information about the pld-cvs-commit
mailing list