diff --git a/.gitignore b/.gitignore index d614ac2..51b761e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /audacity-minsrc-2.1.0.tar.xz /audacity-manual-2.1.0.zip +/audacity-dea351aa4820efd7ce8c2254930f942a6590472b.tar.gz diff --git a/audacity.spec b/audacity.spec index c8824d4..2cf847d 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,10 +1,12 @@ # Compile options: %bcond_without mp3 +%global commit dea351aa4820efd7ce8c2254930f942a6590472b +%global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: audacity -Version: 2.1.0 -Release: 4%{?dist} +Version: 2.1.1 +Release: 0.1.%{shortcommit}%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 @@ -12,10 +14,13 @@ URL: http://audacity.sourceforge.net %define realname audacity -# use for upstream source releases: -Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.tar.xz +# use for upstream source releases (git now): +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: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.tar.xz #Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.xz -%define tartopdir audacity-minsrc-%{version} +#%define tartopdir audacity-minsrc-%{version} +%define tartopdir audacity-%{commit} Source1: http://downloads.sf.net/sourceforge/audacity/audacity-manual-%{version}.zip #Source1: http://audacity.googlecode.com/files/audacity-manual-%{version}.zip @@ -202,6 +207,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed Jun 24 2015 David Timms - 2.1.1-0.1.dea351a +- Update to 2.1.1 pre-release git snapshot to prepare for release. + * Wed Jun 17 2015 Fedora Release Engineering - 2.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -217,7 +225,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : * Mon Mar 30 2015 Richard Hughes - 2.1.0-0.2.rc2 - Use better AppData screenshots - * Thu Mar 05 2015 David Timms - 2.1.0-0.1.rc2 - Update to release candidate 2 for testing. diff --git a/sources b/sources index 5d5fb2f..86d2d97 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d21a794cc1e2a1567d3d75b53b1f2f02 audacity-minsrc-2.1.0.tar.xz -7d6eeb30b87a73dc74ac2f0252d8ee02 audacity-manual-2.1.0.zip +5870b7b50ce8ea93c6c33334fa213446 audacity-dea351aa4820efd7ce8c2254930f942a6590472b.tar.gz