From 899f056f46ab9e337f46ecb67e8a59b33130ae3d Mon Sep 17 00:00:00 2001
From: David Timms <dtimms@iinet.net.au>
Date: May 04 2011 20:50:05 +0000
Subject: attempt to resolve can't build or change branch, yet git diff= no changes.


---

diff --git a/audacity.spec b/audacity.spec
index 96122dd..a8cebb0 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -4,7 +4,7 @@
 Name: audacity
 
 Version: 1.3.13
-Release: 0.4.beta%{?dist}
+Release: 0.3.beta%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
 License: GPLv2
@@ -14,7 +14,6 @@ URL:     http://audacity.sourceforge.net
 %define realname audacity
 
 Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-beta.tar.bz2
-# The manual is not versioned; it is essentially a work in progress
 Source1: http://manual.audacityteam.org/help.zip
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
@@ -62,11 +61,6 @@ supports OSS and ALSA under Linux.
 %package manual
 Summary: manual for Audacity - offline install
 
-
-# -manual suits either audacity or audacity-freeworld; both create the path:
-Requires: /usr/bin/audacity
-
-
 %description manual
 Audacity Manual can be installed locally if preferred, or accessed on-line
 if internet connection is available.
@@ -154,10 +148,7 @@ update-desktop-database &> /dev/null || :
 %files -f %{realname}.lang
 %defattr(-,root,root,-)
 %{_bindir}/%{realname}
-%dir %{_datadir}/%{realname}
-%{_datadir}/%{realname}/EQDefaultCurves.xml
-%{_datadir}/%{realname}/nyquist/
-%{_datadir}/%{realname}/plug-ins/
+%{_datadir}/%{realname}/
 %{_mandir}/man*/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
@@ -167,16 +158,10 @@ update-desktop-database &> /dev/null || :
 
 
 %files manual
-%{_datadir}/%{realname}/help/
+%{_datadir}/%{realname}/help/manual/
 
 
 %changelog
-* Wed May  4 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.4.beta
-- add Requires on audacity folder path to pick up either audacity* package
-
-* Sat Apr 30 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.4.beta
-- fix files and dir ownership including -manual files in the main package
-
 * Tue Apr 26 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.3.beta
 - add audacity manual help file Source and subpackage