[audacity] New upstream release 2.0.3 (rhbz#951001)
Hans de Goede
jwrdegoede at fedoraproject.org
Sat May 4 14:23:48 UTC 2013
commit 792feaeddec609e7211bce09581af2c3e2a5f29b
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sat May 4 16:27:39 2013 +0200
New upstream release 2.0.3 (rhbz#951001)
- Use system portaudio
- Add icon-cache update scriptlets
.gitignore | 2 +
audacity.spec | 58 +++++++++++++++++++++++++++++++++++++++++++-------------
sources | 4 +-
3 files changed, 48 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ccc96d..933578a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/audacity-minsrc-2.0.2.tar.bz2
/audacity-manual-2.0.2.zip
+/audacity-minsrc-2.0.3.tar.xz
+/audacity-manual-2.0.3.zip
diff --git a/audacity.spec b/audacity.spec
index 6f2517c..3a35fbe 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -1,10 +1,10 @@
# Compile options:
-# --with mp3 : enable mp3 support
+%bcond_without mp3
Name: audacity
-Version: 2.0.2
-Release: 3%{?dist}
+Version: 2.0.3
+Release: 1%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -14,7 +14,7 @@ URL: http://audacity.sourceforge.net
# use for upstream source releases:
#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}-beta.tar.bz2
-Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.bz2
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.xz
%define tartopdir audacity-src-%{version}
Source1: http://audacity.googlecode.com/files/audacity-manual-%{version}.zip
@@ -40,16 +40,16 @@ BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
+BuildRequires: portaudio-devel >= 19-16
BuildRequires: soundtouch-devel
-%if 0%{?fedora} < 11
-BuildRequires: vamp-plugin-sdk-devel
-%else
+BuildRequires: soxr-devel
BuildRequires: vamp-plugin-sdk-devel >= 2.0
-%endif
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: wxGTK-devel
-%{?_with_mp3:BuildRequires: libmad-devel}
+%{?_with_mp3:BuildRequires: libmad-devel twolame-devel}
+# For new symbols in portaudio
+Requires: portaudio%{?_isa} >= 19-16
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
@@ -60,7 +60,7 @@ supports OSS and ALSA under Linux.
%package manual
Summary: manual for Audacity - offline install
-
+BuildArch: noarch
# -manual suits either audacity or audacity-freeworld; both create the path:
Requires: /usr/bin/audacity
@@ -95,21 +95,32 @@ done
%configure \
--with-help \
--with-libsndfile=system \
+ --with-libsoxr=system \
--without-libresample \
- --with-libsamplerate=system \
+ --without-libsamplerate \
--with-libflac=system \
--with-ladspa \
--with-vorbis=system \
--with-id3tag=system \
--with-expat=system \
--with-soundtouch=system \
+ --with-libvamp=system \
+ --with-portaudio=system \
--without-ffmpeg \
- %{?_with_mp3:--with-libmad=system} \
+ %{?_with_mp3:--with-libmad=system --with-libtwolame=system} \
+ %{!?_with_mp3:--without-libmad --without-libtwolame} \
%ifnarch %{ix86} x86_64
--disable-sse \
%else
%{nil}
%endif
+
+# ensure we use the system headers for these, note we do this after
+# configure as it wants to run sub-configures in these dirs
+for i in ffmpeg libresample libsoxr libvamp portaudio-v19; do
+ rm -rf lib-src/$i
+done
+
# _smp_mflags cause problems
make
@@ -124,20 +135,33 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual
%{find_lang} %{realname}
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+%if 0%{?fedora} && 0%{?fedora} < 19
+ --vendor fedora \
+%endif
$RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
# audacity manual must be unzipped to correct location
unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname}
+
%post
umask 022
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
umask 022
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files -f %{realname}.lang
%{_bindir}/%{realname}
@@ -155,7 +179,13 @@ update-desktop-database &> /dev/null || :
%files manual
%{_datadir}/%{realname}/help/
+
%changelog
+* Sat May 4 2013 Hans de Goede <hdegoede at redhat.com> - 2.0.3-1
+- New upstream release 2.0.3 (rhbz#951001)
+- Use system portaudio
+- Add icon-cache update scriptlets
+
* Sun Feb 10 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 2.0.2-3
- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
- clean up spec to follow current guidelines
@@ -168,7 +198,7 @@ update-desktop-database &> /dev/null || :
- update to manual-2.0.2
- adjust manual extract path to suit changes to manual.zip
-* Tue Jul 19 2012 David Timms <iinet.net.au at dtimms> - 2.0.1-1
+* Thu Jul 19 2012 David Timms <iinet.net.au at dtimms> - 2.0.1-1
- update to 2.0.1 final
- rebase libmp3lame-default.patch
- rebase desktop.in.patch
@@ -486,7 +516,7 @@ update-desktop-database &> /dev/null || :
* Thu Apr 7 2005 Gerard Milmeister <gemi at bluewin.ch> - 1.2.3-3
- Build gtk2 version by default
-* Fri Apr 7 2005 Michael Schwendt <mschwendt at fedoraproject.org>
+* Thu Apr 7 2005 Michael Schwendt <mschwendt at fedoraproject.org>
- rebuilt
* Tue Apr 5 2005 Gerard Milmeister <gemi at bluewin.ch> - 1.2.3-2
diff --git a/sources b/sources
index b79af62..9cd0af8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c838bc4485b0af104a7f6d9c6955a284 audacity-minsrc-2.0.2.tar.bz2
-2c80017f602dd6239ec3b6b0c25e68df audacity-manual-2.0.2.zip
+648cce8a9ce86eebfc53921172ee9d89 audacity-minsrc-2.0.3.tar.xz
+e11a2b16ec3234b4fdab0a4d396b9def audacity-manual-2.0.3.zip
More information about the scm-commits
mailing list