From 10d75568f79b7f0eaaa6185cd4b5bf51f5ba60d1 Mon Sep 17 00:00:00 2001
From: David Timms <dtimms@iinet.net.au>
Date: Apr 01 2015 11:27:03 +0000
Subject: Update to 2.1.0 final release.


---

diff --git a/.gitignore b/.gitignore
index 971096e..d614ac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-/audacity-minsrc-2.0.4.tar.xz
-/audacity-manual-2.0.4.zip
-/audacity-minsrc-2.0.5.tar.xz
-/audacity-manual-2.0.5.zip
-/audacity-minsrc-2.0.6.tar.xz
-/audacity-manual-2.0.6.zip
+/audacity-minsrc-2.1.0.tar.xz
+/audacity-manual-2.1.0.zip
diff --git a/audacity.spec b/audacity.spec
index 7feb338..f766218 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -4,7 +4,7 @@
 Name: audacity
 
 Version: 2.1.0
-Release: 0.2.rc2%{?dist}
+Release: 1%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
 License: GPLv2
@@ -13,11 +13,11 @@ URL:     http://audacity.sourceforge.net
 %define realname audacity
 
 # use for upstream source releases:
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}rc2.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}
 
-Source1: http://audacity.googlecode.com/files/audacity-manual-%{version}rc2.zip
+Source1: http://downloads.sf.net/sourceforge/audacity/audacity-manual-%{version}.zip
 #Source1: http://audacity.googlecode.com/files/audacity-manual-%{version}.zip
 
 # Patch1: audacity-2.0.4-libmp3lame-default.patch
@@ -132,6 +132,7 @@ make
 %make_install
 rm -Rf $RPM_BUILD_ROOT%{_datadir}/%{realname}/include
 
+if appstream-util --help | grep -q replace-screenshots ; then
 # Update the screenshot shown in the software center
 #
 # NOTE: It would be *awesome* if this file was pushed upstream.
@@ -140,6 +141,7 @@ rm -Rf $RPM_BUILD_ROOT%{_datadir}/%{realname}/include
 #
 appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/audacity.appdata.xml \
   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/audacity/a.png 
+fi
 
 # Audacity 1.3.8-beta complains if the help/manual directories
 # don't exist.
@@ -155,8 +157,6 @@ desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
 
 # audacity manual must be unzipped to correct location
 unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname}
-# remove __MACOSX subfolder contents.
-rm -Rf $RPM_BUILD_ROOT%{_datadir}/%{realname}/__MACOSX
 
 
 %post
@@ -198,6 +198,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Mar 31 2015 David Timms <iinet.net.au@dtimms> - 2.1.0-1
+- Update to 2.1.0 final release.
+
 * Mon Mar 30 2015 Richard Hughes <rhughes@redhat.com> - 2.1.0-0.2.rc2
 - Use better AppData screenshots
 
diff --git a/sources b/sources
index 3f36e39..5d5fb2f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fb7b39a1ec8cb562be5ee65725af8832  audacity-minsrc-2.0.6.tar.xz
-02066a9201bbf8f790dcc08b8a2bb371  audacity-manual-2.0.6.zip
+d21a794cc1e2a1567d3d75b53b1f2f02  audacity-minsrc-2.1.0.tar.xz
+7d6eeb30b87a73dc74ac2f0252d8ee02  audacity-manual-2.1.0.zip