rpms/moc/F-20 .cvsignore, 1.2, 1.3 moc.spec, 1.1, 1.2 sources, 1.2, 1.3 moc+warnings.patch, 1.1, NONE moc-r2506+fsf_addr.patch, 1.1, NONE moc-r2506:2526-samplesize.patch, 1.1, NONE

[Antonio]

Author: sagitter

Update of /cvs/free/rpms/moc/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32324/F-20

Modified Files:
	.cvsignore moc.spec sources 
Removed Files:
	moc+warnings.patch moc-r2506+fsf_addr.patch 
	moc-r2506:2526-samplesize.patch 
Log Message:
Release update to moc-2.5.0-beta2.



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Oct 2013 10:33:19 -0000	1.2
+++ .cvsignore	13 Mar 2014 17:30:02 -0000	1.3
@@ -1 +1 @@
-moc-2.5.0-beta1.tar.bz2
+moc-2.5.0-beta2.tar.bz2


Index: moc.spec
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/moc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moc.spec	19 Oct 2013 10:33:19 -0000	1.1
+++ moc.spec	13 Mar 2014 17:30:02 -0000	1.2
@@ -4,21 +4,10 @@
 Name:    moc
 Summary: Music on Console - Console audio player for Linux/UNIX
 Version: 2.5.0
-Release: 0.10.beta1%{?dist}
+Release: 0.1.beta2%{?dist}
 License: GPLv2+ and GPLv3+
 URL:     http://www.moc.daper.net
-Source0: http://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-beta1.tar.bz2
-
-## This patch corrects all outdated FSF address
-Patch0: %{name}-r2506+fsf_addr.patch
-
-## This patchset corrects "Unsupported sample size!" error
-## See http://moc.daper.net/node/862
-Patch1: %{name}-r2506:2526-samplesize.patch
-
-## This patch corrects 'sizeof' argument bug; 
-## directly provided from upstream 
-Patch2: %{name}+warnings.patch
+Source0: http://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-beta2.tar.bz2
 
 BuildRequires: pkgconfig(ncurses) 
 BuildRequires: pkgconfig(alsa) 
@@ -43,12 +32,11 @@
 BuildRequires: pkgconfig(opus)
 BuildRequires: libtool
 BuildRequires: librcc-devel
-
-## Source code configuring tools
-BuildRequires: autoconf, automake >= 1.13
+BuildRequires: libquvi-devel, popt-devel
 
 Requires: ffmpeg  
 Requires: opus
+Requires: libquvi, libquvi-scripts, popt
 
 %description
 MOC (music on console) is a console audio player for LINUX/UNIX designed to be
@@ -57,25 +45,15 @@
 files in this directory beginning from the chosen file.
 
 %prep
-%setup -q -n %{name}-%{version}-beta1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-## This renaming is requested by Automake-1.13
-mv configure.in configure.ac
+%setup -q -n %{name}-%{version}-beta2
 
 %build
-
-## Latest patchset changes ffmpeg.m4 file
-## Autoreconf is temporarily necessary
-autoreconf -i --force
-
-%configure --disable-static --with-rcc \
+%configure --disable-static --disable-silent-rules \
+           --disable-rpath --with-rcc \
            --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
            --with-musepack --with-vorbis --with-flac --with-wavpack  \
            --with-sndfile --with-modplug --with-ffmpeg --with-speex  \
-           --with-samplerate --with-curl
+           --with-samplerate --with-curl --disable-debug --without-magic
 make %{?_smp_mflags}
 
 %install
@@ -97,6 +75,10 @@
 %{_libdir}/%{name}/decoder_plugins
 
 %changelog
+* Wed Feb 05 2014 Antonio Trande <sagitter at fedoraproject.org> 2.5.0-0.1.beta2
+- Update to 2.5.0-beta2
+- Removed previous patches
+
 * Tue Jun 18 2013 Antonio Trande <sagitter at fedoraproject.org> 2.5.0-0.10.beta1
 - Added patchset to fix "Unsupported sample size!" error
   See http://moc.daper.net/node/862 for more details


Index: sources
===================================================================
RCS file: /cvs/free/rpms/moc/F-20/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Oct 2013 10:33:19 -0000	1.2
+++ sources	13 Mar 2014 17:30:02 -0000	1.3
@@ -1 +1 @@
-795ecba86847e082aa2f21937cc04804  moc-2.5.0-beta1.tar.bz2
+da87b90b57934234589b63e347921458  moc-2.5.0-beta2.tar.bz2


--- moc+warnings.patch DELETED ---


--- moc-r2506+fsf_addr.patch DELETED ---


--- moc-r2506:2526-samplesize.patch DELETED ---