diff --git a/.gitignore b/.gitignore index cec8c78..ef8cb00 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /audacity-minsrc-2.1.1.tar.xz /audacity-manual-2.1.1.zip +/audacity-ecdb1d81c9312789c6233aba2190572344b22188.tar.gz diff --git a/audacity.spec b/audacity.spec index faf52b4..28f54b4 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,12 +1,12 @@ # Compile options: %bcond_without mp3 -#%#global commit dea351aa4820efd7ce8c2254930f942a6590472b -#%#global shortcommit %(c=%#{commit}; echo ${c:0:7}) +%global commit0 ecdb1d81c9312789c6233aba2190572344b22188 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: audacity -Version: 2.1.1 -Release: 1%{?dist} +Version: 2.1.2 +Release: 0.6.20151112git%{shortcommit0}%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -14,15 +14,18 @@ URL: http://audacity.sourceforge.net %define realname audacity -Source0: http://www.fosshub.com/Audacity.html/%{name}-minsrc-%{version}.tar.xz +#Source0: http://www.fosshub.com/Audacity.html/%#{name}-minsrc-%#{version}.tar.xz # For alpha git snapshots for testing use the github archive as upstream source: -#Source0: https://github.com/audacity/%#{name}/archive/%#{commit}/%#{name}-%#{commit}.tar.gz -# ie https://github.com/audacity/audacity/archive/dea351aa4820efd7ce8c2254930f942a6590472b/audacity-dea351aa4820efd7ce8c2254930f942a6590472b.tar.xz +Source0: https://github.com/audacity/%{name}/archive/%{commit0}/%{name}-%{commit0}.tar.gz +# ie https://github.com/audacity/audacity/archive/ecdb1d81c9312789c6233aba2190572344b22188/audacity-ecdb1d81c9312789c6233aba2190572344b22188.tar.gz #Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%#{version}.tar.xz -%define tartopdir audacity-minsrc-%{version} + +%define tartopdir audacity-%{commit0} +#%#define tartopdir audacity-minsrc-%#{version} #%#define tartopdir audacity-%#{commit} -Source1: http://www.fosshub.com/Audacity.html/%{name}-manual-%{version}.zip +#Source1: http://www.fosshub.com/Audacity.html/%#{name}-manual-%#{version}.zip +Source1: http://www.fosshub.com/Audacity.html/%{name}-manual-2.1.1.zip #Source1: http://downloads.sf.net/sourceforge/audacity/audacity-manual-%#{version}.zip # Patch1: audacity-2.0.4-libmp3lame-default.patch @@ -51,7 +54,7 @@ BuildRequires: soxr-devel BuildRequires: vamp-plugin-sdk-devel >= 2.0 BuildRequires: zip BuildRequires: zlib-devel -BuildRequires: wxGTK-devel +BuildRequires: wxGTK3-devel %if 0%{?rhel} >= 8 || 0%{?fedora} BuildRequires: libappstream-glib %endif @@ -59,6 +62,7 @@ BuildRequires: libappstream-glib # For new symbols in portaudio Requires: portaudio%{?_isa} >= 19-16 + %description Audacity is a cross-platform multitrack audio editor. It allows you to record sounds directly or to import files in various formats. It features @@ -77,6 +81,7 @@ Audacity Manual can be installed locally if preferred, or accessed on-line if internet connection is available. For the most up to date manual content, use the on-line manual. + %prep %setup -q -n %{tartopdir} @@ -205,6 +210,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Thu Nov 12 2015 David Timms - 2.1.2-0.6.20151112gitecdb1d8 +- 2.1.2 Alpha git snapshot. +- Test build of git master which requires wxGTK3. + * Sun Jul 19 2015 David Timms - 2.1.1-1 - Release of Audacity 2.1.1. diff --git a/sources b/sources index d168f8e..fa04274 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 9e37b1f5cde38d089a35febb904a9e39 audacity-minsrc-2.1.1.tar.xz a4116a20798b827cd1e06e50c8099aa6 audacity-manual-2.1.1.zip +5eb4b192fa64649a2e93e9aa66286385 audacity-ecdb1d81c9312789c6233aba2190572344b22188.tar.gz