[moc] Use %%{?_isa} on 'Requires' package
commit c1e20ce483dd65186e868eba8d83f2684f1401b7
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue Apr 24 18:04:29 2018 +0200
Use %%{?_isa} on 'Requires' package
moc-r2961+lt_init-1.patch | 21 +++++++++++++++++++++
moc.spec | 11 +++++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/moc-r2961+lt_init-1.patch b/moc-r2961+lt_init-1.patch
new file mode 100644
index 0000000..098f928
--- /dev/null
+++ b/moc-r2961+lt_init-1.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.in b/configure.in
+index 3e3b11d..b1c974b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,8 @@ AC_INIT([Music On Console],[2.6-alpha3],[mocmaint(a)daper.net],[moc],
+ AC_CONFIG_SRCDIR([main.c])
+ AC_CONFIG_HEADERS([config.h])
+
++LT_INIT
++
+ AM_INIT_AUTOMAKE([dist-xz no-dist-gzip])
+
+ AC_PREREQ([2.64])
+@@ -34,7 +36,6 @@ AC_PROG_AWK
+ AC_LIBTOOL_DLOPEN
+ AC_DISABLE_STATIC
+ AC_ENABLE_SHARED
+-AC_PROG_LIBTOOL
+ AC_LIB_LTDL
+
+ AC_SUBST([EXTRA_OBJS])
diff --git a/moc.spec b/moc.spec
index 9b7b6c9..b25083d 100644
--- a/moc.spec
+++ b/moc.spec
@@ -10,7 +10,7 @@
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.6
-Release: 0.25.alpha3%{?dist}
+Release: 0.26.alpha3%{?dist}
License: GPLv3+
URL: http://moc.daper.net
@@ -22,6 +22,7 @@ URL: http://moc.daper.net
Source0: http://ftp.daper.net/pub/soft/moc/unstable/moc-%{version}-alpha3.tar.xz
Patch0: %{name}-ffmpeg35_buildfix.patch
Patch1: %{name}-r2961+timidity_sint8-1.patch
+Patch2: %{name}-r2961+lt_init-1.patch
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(alsa)
@@ -50,7 +51,7 @@ BuildRequires: libmad-devel
BuildRequires: faad2-devel
BuildRequires: autoconf, automake
-Requires: ffmpeg
+Requires: ffmpeg%{?_isa}
%description
MOC (music on console) is a console audio player for LINUX/UNIX designed to be
@@ -64,8 +65,11 @@ files in this directory beginning from the chosen file.
%patch0 -p1
%endif
%patch1 -p1
+%patch2 -p1
%build
+mv configure.in configure.ac
+libtoolize -ivfc
autoreconf -ivf
%configure --disable-static --disable-silent-rules --disable-rpath --with-rcc \
@@ -92,6 +96,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/moc/decoder_plugins/*.la
%{_libdir}/%{name}/
%changelog
+* Sun Apr 22 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.6-0.26.alpha3
+- Use %%{?_isa} on 'Requires' package
+
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> -
2.6-0.25.alpha3
- Rebuilt for new ffmpeg snapshot