From b6188b3459c96075aca60451b9576087e57137ec Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Nov 26 2015 01:15:46 +0000
Subject: version 0.4.2


---

diff --git a/.gitignore b/.gitignore
index be7ba38..76ab8cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 aubio-0.3.2.tar.gz
+/aubio-0.4.2.tar.bz2
diff --git a/aubio.spec b/aubio.spec
index d839bb8..137994c 100644
--- a/aubio.spec
+++ b/aubio.spec
@@ -3,24 +3,25 @@
 
 
 Name:           aubio
-Version:        0.3.2
-Release:        17%{?dist}
+Version:        0.4.2
+Release:        1%{?dist}
 Summary:        An audio labelling library
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://aubio.org/
-Source0:        http://aubio.org/pub/aubio-%{version}.tar.gz
-# Fix byte-compilation error. Borrowed from Debian
-Patch0:         aubio-numarray-gnuplot.patch
-# Fix DSO-linking failure
-Patch1:         aubio-linking.patch
-Patch2:         aubio-format-security.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libsndfile-devel libsamplerate-devel fftw-devel
-BuildRequires:  lash-devel jack-audio-connection-kit-devel
-BuildRequires:  python-devel
+Source0:        http://aubio.org/pub/aubio-%{version}.tar.bz2
+
+BuildRequires:  doxygen
+BuildRequires:  fftw-devel
+BuildRequires:  jack-audio-connection-kit-devel
+BuildRequires:  libsamplerate-devel
+BuildRequires:  libsndfile-devel
+BuildRequires:  numpy
+BuildRequires:  pkgconfig
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+BuildRequires:  txt2man
 
 %description
 aubio is a library for audio labelling. Its features include
@@ -49,34 +50,45 @@ Summary:        Python language bindings for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       python
-BuildRequires:  python swig
 
 %description    python
 The %{name}-python package contains the Python language bindings for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1 -b .linking
-%patch2 -p1
 
-%build
-%configure --disable-static
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
 
+%build
+./waf configure \
+    --prefix="%_prefix" \
+    --bindir="%_bindir" \
+    --sysconfdir="%_sysconfdir" \
+    --datadir="%_datadir" \
+    --includedir="%_includedir" \
+    --libdir="%_libdir" \
+    --mandir="%_mandir" \
+    --docdir="%_docdir" \
+    --enable-fftw3f \
+    --enable-complex \
+    --enable-jack \
+    --enable-samplerate
+
+./waf build %{?_smp_mflags}
+
+pushd python
+%py2_build
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# Move everything to sitearch...
-if [ %{python_sitearch} != %{python_sitelib} ]; then
-  mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
-  mv $RPM_BUILD_ROOT%{python_sitelib}/%{name} $RPM_BUILD_ROOT%{python_sitearch}
-fi
+./waf --destdir=%{buildroot} install
+rm -rf libaubio-doc
+cp -r %{buildroot}%{_docdir}/libaubio-doc libaubio-doc
+rm -rf %{buildroot}%{_docdir}/libaubio-doc
+
+pushd python
+%py2_install
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,22 +101,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README THANKS
+%license COPYING
+%doc AUTHORS ChangeLog README.md
 %{_libdir}/*.so.*
 %{_bindir}/*
-%{_datadir}/sounds/%{name}
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
+%doc libaubio-doc/html
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 %{_includedir}/aubio
 
 %files python
 %defattr(-,root,root,-)
-%{python_sitearch}/%{name}
+%{python2_sitearch}/%{name}
+%{python2_sitearch}/%{name}*.egg-info
 
 %changelog
+* Thu Nov 26 2015 Nils Philippsen <nils@tiptoe.de> - 0.4.2-1
+- version 0.4.2
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 83ae1b7..3f16ac8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffc3e5e4880fec67064f043252263a44  aubio-0.3.2.tar.gz
+c0f6d8355e92669722501c3a762ba548  aubio-0.4.2.tar.bz2