Author: sagitter Update of /cvs/free/rpms/moc/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24135/F-20 Modified Files: .cvsignore moc.spec sources Log Message: Update to new commit including a batch of patches. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/moc/F-20/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Mar 2014 17:30:02 -0000 1.3 +++ .cvsignore 20 Mar 2014 12:50:39 -0000 1.4 @@ -1 +1 @@ -moc-2.5.0-beta2.tar.bz2 +moc-2.5.0-13.beta2.tar.gz Index: moc.spec =================================================================== RCS file: /cvs/free/rpms/moc/F-20/moc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- moc.spec 13 Mar 2014 17:30:02 -0000 1.2 +++ moc.spec 20 Mar 2014 12:50:39 -0000 1.3 @@ -1,13 +1,17 @@ # Set up a new macro to define MOC's 'mocp' executable -%global exec mocp +%global exec mocp Name: moc Summary: Music on Console - Console audio player for Linux/UNIX Version: 2.5.0 -Release: 0.1.beta2%{?dist} +Release: 0.13.beta2%{?dist} License: GPLv2+ and GPLv3+ URL: http://www.moc.daper.net -Source0: http://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-beta2.tar.bz2 + +## Source archive from svn #2624; obtained by: +## svn co svn://daper.net/moc/trunk +## tar -czvf moc-2.5.0-3.beta2.tar.gz trunk +Source0: %{name}-%{version}-13.beta2.tar.gz BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(alsa) @@ -34,6 +38,8 @@ BuildRequires: librcc-devel BuildRequires: libquvi-devel, popt-devel +BuildRequires: autoconf, automake + Requires: ffmpeg Requires: opus Requires: libquvi, libquvi-scripts, popt @@ -45,9 +51,14 @@ files in this directory beginning from the chosen file. %prep -%setup -q -n %{name}-%{version}-beta2 +%setup -q -n trunk %build + +## Compilation files built temporary +mv configure.in configure.ac +autoreconf -i + %configure --disable-static --disable-silent-rules \ --disable-rpath --with-rcc \ --with-oss --with-alsa --with-jack --with-aac --with-mp3 \ @@ -62,6 +73,14 @@ rm -f $RPM_BUILD_ROOT%_libdir/*.la rm -f $RPM_BUILD_ROOT%_libdir/moc/decoder_plugins/*.la +%ifarch armv6hl armv7hl +pushd $RPM_BUILD_ROOT + for i in `find . -perm /644 -type f \( -name "*.so" -o -name "mocp" \)`; do + chmod a+x $i +done +popd +%endif + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -75,7 +94,14 @@ %{_libdir}/%{name}/decoder_plugins %changelog -* Wed Feb 05 2014 Antonio Trande <sagitter(a)fedoraproject.org&gt; 2.5.0-0.1.beta2 +* Thu Mar 20 2014 Antonio Trande <sagitter(a)fedoraproject.org&gt; 2.5.0-0.13.beta2 +- New svn commit of MOC-2.5.0 pre-release +- Fixed release increment number for the pre-releases + +* Wed Feb 26 2014 Antonio Trande <sagitter(a)fedoraproject.org&gt; 2.5.0-0.12.beta2 +- Fix unstripped-binary-or-object warnings for ARM builds + +* Wed Feb 05 2014 Antonio Trande <sagitter(a)fedoraproject.org&gt; 2.5.0-0.11.beta2 - Update to 2.5.0-beta2 - Removed previous patches Index: sources =================================================================== RCS file: /cvs/free/rpms/moc/F-20/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Mar 2014 17:30:02 -0000 1.3 +++ sources 20 Mar 2014 12:50:39 -0000 1.4 @@ -1 +1 @@ -da87b90b57934234589b63e347921458 moc-2.5.0-beta2.tar.bz2 +75e9cfd8f25ddbbaf6551d299c1dd4b7 moc-2.5.0-13.beta2.tar.gz