[moc] SVN checkout svn2992
commit efe8c67432362755dcf738c5ac1e99fa86cdab30
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Dec 27 21:38:42 2018 +0100
SVN checkout svn2992
.gitignore | 1 +
moc-ffmpeg35_buildfix.patch | 32 --------------------------------
moc-r2961+timidity_sint8-1.patch | 13 -------------
moc.spec | 35 +++++++++++++++++++++--------------
sources | 2 +-
5 files changed, 23 insertions(+), 60 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3a386a..59c4eb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
moc-2.6-0.5.alpha1.tar.xz
/moc-git2880.tar.gz
/moc-2.6-alpha3.tar.xz
+/moc-git2992.tar.gz
diff --git a/moc.spec b/moc.spec
index 316e7b0..c93b7f5 100644
--- a/moc.spec
+++ b/moc.spec
@@ -1,8 +1,12 @@
+## Debug builds?
+%bcond_with debug
+#
+
# Filtering of private libraries
%global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$
#
-#%%global checkout 2880
+%global checkout 2992
# Set up a new macro to define MOC's 'mocp' executable
%global exec mocp
@@ -10,7 +14,7 @@
Name: moc
Summary: Music on Console - Console audio player for Linux/UNIX
Version: 2.6
-Release: 0.28.alpha3%{?dist}
+Release: 0.29.svn%{checkout}%{?dist}
License: GPLv3+
URL: http://moc.daper.net
@@ -18,11 +22,8 @@ URL: http://moc.daper.net
## svn co svn://svn.daper.net/moc/trunk
## rm -rf trunk/.svn
## tar -cvzf moc-git%%{checkout}.tar.gz trunk
-#Source0: moc-git%%{checkout}.tar.gz
-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
+Source0: moc-git%{checkout}.tar.gz
+Patch0: %{name}-r2961+lt_init-1.patch
BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(alsa)
@@ -59,23 +60,26 @@ using the menu similar to Midnight Commander, and MOC will start
playing all
files in this directory beginning from the chosen file.
%prep
-%setup -q -n moc-%{version}-alpha3
-%if 0%{?fedora} > 27
-%patch0 -p1
-%endif
-%patch1 -p1
-%patch2 -p1
+%autosetup -p 1 -n trunk
%build
mv configure.in configure.ac
libtoolize -ivfc
autoreconf -ivf
+%if %{with debug}
+export CFLAGS="-O0 -g"
+%endif
%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 --disable-debug --without-magic \
+ --with-samplerate --with-curl --without-magic \
+%if %{with debug}
+ --enable-debug \
+%else
+ --disable-debug \
+%endif
CPPFLAGS="-I%{_includedir}/libdb -fPIC"
%make_build
@@ -95,6 +99,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/moc/decoder_plugins/*.la
%{_libdir}/%{name}/
%changelog
+* Thu Dec 27 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.6-0.29.svn2992
+- SVN checkout svn2992
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
2.6-0.28.alpha3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 4265605..8b1119c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d828fda8e9cd0e2ba625457926aa6e4 moc-2.6-alpha3.tar.xz
+f65cf51f9a16bdad3ca3ec0fff15b5a8 moc-git2992.tar.gz