- up to 0.23

- update urls
- patch for missing m4 macros: AX_CHECK_LINK_FLAG/AX_APPEND_LINK_FLAGS

diff --git a/mpc-missing_macros.patch b/mpc-missing_macros.patch
new file mode 100644 (file)
index 0000000..f594b58
--- /dev/null
+++ b/mpc-missing_macros.patch
@@ -0,0 +1,142 @@
+diff -urN mpc-0.23.orig/m4/ax_append_link_flags.m4 mpc-0.23/m4/ax_append_link_flags.m4
+--- mpc-0.23.orig/m4/ax_append_link_flags.m4   1970-01-01 01:00:00.000000000 +0100
++++ mpc-0.23/m4/ax_append_link_flags.m4        2013-07-21 18:37:14.628220134 +0200
+@@ -0,0 +1,63 @@
++# ===========================================================================
++#   http://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
++#
++# DESCRIPTION
++#
++#   For every FLAG1, FLAG2 it is checked whether the linker works with the
++#   flag.  If it does, the flag is added FLAGS-VARIABLE
++#
++#   If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is
++#   used. During the check the flag is always added to the linker's flags.
++#
++#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
++#   when the check is done.  The check is thus made with the flags: "LDFLAGS
++#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
++#   issue an error when a bad flag is given.
++#
++#   NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG.
++#   Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS.
++#
++# LICENSE
++#
++#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 3
++
++AC_DEFUN([AX_APPEND_LINK_FLAGS],
++[AC_REQUIRE([AX_CHECK_LINK_FLAG])
++AC_REQUIRE([AX_APPEND_FLAG])
++for flag in $1; do
++  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3])
++done
++])dnl AX_APPEND_LINK_FLAGS
+diff -urN mpc-0.23.orig/m4/ax_check_link_flag.m4 mpc-0.23/m4/ax_check_link_flag.m4
+--- mpc-0.23.orig/m4/ax_check_link_flag.m4     1970-01-01 01:00:00.000000000 +0100
++++ mpc-0.23/m4/ax_check_link_flag.m4  2013-07-21 18:37:23.158219873 +0200
+@@ -0,0 +1,71 @@
++# ===========================================================================
++#    http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
++#
++# DESCRIPTION
++#
++#   Check whether the given FLAG works with the linker or gives an error.
++#   (Warnings, however, are ignored)
++#
++#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
++#   success/failure.
++#
++#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
++#   when the check is done.  The check is thus made with the flags: "LDFLAGS
++#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
++#   issue an error when a bad flag is given.
++#
++#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
++#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
++#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 2
++
++AC_DEFUN([AX_CHECK_LINK_FLAG],
++[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
++AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
++  ax_check_save_flags=$LDFLAGS
++  LDFLAGS="$LDFLAGS $4 $1"
++  AC_LINK_IFELSE([AC_LANG_PROGRAM()],
++    [AS_VAR_SET(CACHEVAR,[yes])],
++    [AS_VAR_SET(CACHEVAR,[no])])
++  LDFLAGS=$ax_check_save_flags])
++AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
++  [m4_default([$2], :)],
++  [m4_default([$3], :)])
++AS_VAR_POPDEF([CACHEVAR])dnl
++])dnl AX_CHECK_LINK_FLAGS

diff --git a/mpc.spec b/mpc.spec
index 30ff41c82696a3e5b080f67f13bb8efac9334932..a6fcfe92fa8547be7a58bd97a0bd60d6238d6ac6 100644 (file)
--- a/mpc.spec
+++ b/mpc.spec
@@ -1,13 +1,14 @@
 Summary:       Comandline client for mpd
 Summary(pl.UTF-8):     Klient wiersza poleceń dla mpd
 Name:          mpc
-Version:       0.21
+Version:       0.23
 Release:       1
 License:       GPL
 Group:         Applications
-Source0:       http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.bz2
-# Source0-md5: d8f88aad5fa7ed4c6e7005c5ec1ba7c5
-URL:           http://mpd.wikia.com/wiki/Client:Mpc
+Source0:       http://www.musicpd.org/download/mpc/0/%{name}-%{version}.tar.bz2
+# Source0-md5: 2b2c093e80b37fc5717caf319986c52b
+Patch0:                %{name}-missing_macros.patch
+URL:           http://www.musicpd.org
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: libmpdclient-devel >= 2.2
@@ -31,6 +32,7 @@ This package provides bash-completion for mpc.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal} -I m4