- updated to final 1.0.0 (latest stable version)

- updated dynamic_id3lib patch, removed outdated wxGTK-2.3.2 patch
- added missing dir (%%{_datadir}/audacity), removed LICENSE.txt (it's just GPL)

Changed files:
    audacity-dynamic_id3lib.patch -> 1.2
    audacity-wxGTK-2.3.2.patch -> 1.5
    audacity.spec -> 1.14

diff --git a/audacity-dynamic_id3lib.patch b/audacity-dynamic_id3lib.patch
index 64a7d3f7824ec4f3e9590bef8260aef23fc258bc..67d4efb9d2aee99dbf18f4ee0c71b814379ce8aa 100644 (file)
--- a/audacity-dynamic_id3lib.patch
+++ b/audacity-dynamic_id3lib.patch
@@ -1,33 +1,21 @@
-diff -urN audacity-src-0.98.orig/configure.in audacity-src-0.98/configure.in
---- audacity-src-0.98.orig/configure.in        Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/configure.in     Sat Feb  2 15:08:27 2002
-@@ -54,11 +54,12 @@
-               [enable ogg vorbis support (libraries must be installed) [default=no]])],
-       use_vorbis=$withval,
+--- audacity-src-1.0.0/configure.in.orig       Wed Jun  5 09:51:19 2002
++++ audacity-src-1.0.0/configure.in    Wed Jul 24 21:05:39 2002
+@@ -56,7 +56,7 @@
        use_vorbis="no")
--AC_ARG_WITH(id3,
--      [AC_HELP_STRING([--with-id3],
--              [compile with id3lib (the source is included here) [default=yes]])],
--      use_id3lib=$withval,
--      use_id3lib="yes")
-+dnl AC_ARG_WITH(id3,
-+dnl   [AC_HELP_STRING([--with-id3],
-+dnl           [compile with id3lib (the source is included here) [default=yes]])],
-+dnl   use_id3lib=$withval,
-+dnl   use_id3lib="yes")
-+use_id3lib="yes"
+ AC_ARG_WITH(id3,
+       [AC_HELP_STRING([--with-id3],
+-              [compile with id3lib (the source is included here) [default=no]])],
++              [compile with id3lib (libraries must be installed) [default=no]])],
+       use_id3lib=$withval,
+       use_id3lib="no")
  AC_ARG_WITH(help,
-       [AC_HELP_STRING([--with-help],
-               [Make the help file "audacity-help.htb" [default=yes]])],
-@@ -161,9 +162,9 @@
+@@ -161,9 +161,7 @@
  fi
  
  if [[ $use_id3lib = "yes" ]] ; then
 -      EXTRAOBJS="$EXTRAOBJS id3lib/src/.libs/libid3.a"
 -      MAKEALL="$MAKEALL id3lib/src/.libs/libid3.a"
 -      CFLAGS="$CFLAGS -Iid3lib/include"
-+      dnl EXTRAOBJS="$EXTRAOBJS id3lib/src/.libs/libid3.a"
-+      dnl MAKEALL="$MAKEALL id3lib/src/.libs/libid3.a"
 +      LIBS="$LIBS -lid3"
                
        AC_DEFINE(USE_ID3LIB, 1,

diff --git a/audacity-wxGTK-2.3.2.patch b/audacity-wxGTK-2.3.2.patch
deleted file mode 100644 (file)
index 8c99c45..0000000
--- a/audacity-wxGTK-2.3.2.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -urN audacity-src-0.98.orig/Help.cpp audacity-src-0.98/Help.cpp
---- audacity-src-0.98.orig/Help.cpp    Sun May 12 14:34:09 2002
-+++ audacity-src-0.98/Help.cpp Sun May 12 14:34:31 2002
-@@ -48,6 +48,7 @@
- 
- #else
- 
-+#include <wx/generic/filedlgg.h>
- #include <wx/filedlg.h>
- #include <wx/msgdlg.h>
- #include <wx/textdlg.h>
-diff -urN audacity-src-0.98.orig/ImportRaw.cpp audacity-src-0.98/ImportRaw.cpp
---- audacity-src-0.98.orig/ImportRaw.cpp       Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/ImportRaw.cpp    Sun May 12 14:34:31 2002
-@@ -10,7 +10,7 @@
- 
- #include <math.h>
- 
--#include <wx/button.h>
-+#include <wx/gtk/button.h>
- #include <wx/dc.h>
- #include <wx/dcmemory.h>
- #include <wx/file.h>
-diff -urN audacity-src-0.98.orig/NoteTrack.h audacity-src-0.98/NoteTrack.h
---- audacity-src-0.98.orig/NoteTrack.h Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/NoteTrack.h      Sun May 12 14:37:18 2002
-@@ -11,7 +11,8 @@
- #ifndef __AUDACITY_NOTETRACK__
- #define __AUDACITY_NOTETRACK__
- 
- #include <wx/string.h>
-+#include <wx/dc.h>
- 
- #include "Track.h"
- 
-diff -urN audacity-src-0.98.orig/effects/Amplify.h audacity-src-0.98/effects/Amplify.h
---- audacity-src-0.98.orig/effects/Amplify.h   Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/effects/Amplify.h        Sun May 12 14:34:31 2002
-@@ -15,14 +15,15 @@
- #ifndef __AUDACITY_EFFECT_AMPLIFY__
- #define __AUDACITY_EFFECT_AMPLIFY__
- 
--#include <wx/checkbox.h>
--#include <wx/button.h>
-+#include <wx/gtk/button.h>
- #include <wx/dialog.h>
- #include <wx/stattext.h>
- #include <wx/slider.h>
- #include <wx/textctrl.h>
- #include <wx/sizer.h>
- 
-+#include <wx/checkbox.h>
-+
- // Declare window functions
- 
- #define ID_TEXT 10000
-diff -urN audacity-src-0.98.orig/effects/BassBoost.h audacity-src-0.98/effects/BassBoost.h
---- audacity-src-0.98.orig/effects/BassBoost.h Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/effects/BassBoost.h      Sun May 12 14:34:31 2002
-@@ -15,7 +15,7 @@
- #ifndef __AUDACITY_EFFECT_BASS_BOOST__
- #define __AUDACITY_EFFECT_BASS_BOOST__
- 
--#include <wx/button.h>
-+#include <wx/gtk/button.h>
- #include <wx/dialog.h>
- #include <wx/stattext.h>
- #include <wx/slider.h>
-diff -urN audacity-src-0.98.orig/effects/Phaser.h audacity-src-0.98/effects/Phaser.h
---- audacity-src-0.98.orig/effects/Phaser.h    Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/effects/Phaser.h Sun May 12 14:34:31 2002
-@@ -15,7 +15,7 @@
- #ifndef __AUDACITY_EFFECT_PHASER__
- #define __AUDACITY_EFFECT_PHASER__
- 
--#include <wx/button.h>
-+#include <wx/gtk/button.h>
- #include <wx/dialog.h>
- #include <wx/stattext.h>
- #include <wx/slider.h>
-diff -urN audacity-src-0.98.orig/effects/Wahwah.h audacity-src-0.98/effects/Wahwah.h
---- audacity-src-0.98.orig/effects/Wahwah.h    Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/effects/Wahwah.h Sun May 12 14:34:31 2002
-@@ -15,7 +15,7 @@
- #ifndef __AUDACITY_EFFECT_WAHWAH__
- #define __AUDACITY_EFFECT_WAHWAH__
- 
--#include <wx/button.h>
-+#include <wx/gtk/button.h>
- #include <wx/dialog.h>
- #include <wx/stattext.h>
- #include <wx/slider.h>

diff --git a/audacity.spec b/audacity.spec
index 392043caf44aab14a87b1cf82999be861e36617f..94ce295b6ba5d158a7efc0f26acb92497cf2dd45 100644 (file)
--- a/audacity.spec
+++ b/audacity.spec
@@ -1,28 +1,27 @@
 Summary:       Audacity - manipulate digital audio waveforms
-Summary(pl):   Audacity - manipulacja plikami audio
+Summary(pl):   Audacity - narzêdzie do obróbki plików d¼wiêkowych
 Name:          audacity
-Version:       0.98
-Release:       4
+Version:       1.0.0
+Release:       1
 License:       GPL
 Vendor:                Dominic Mazzoni <dominic@minorninth.com>
 Group:         X11/Applications/Multimedia
-Source0:       http://prdownloads.sourceforge.net/%{name}/%{name}-src-%{version}.tgz
+Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/%{name}/%{name}-src-%{version}.tgz
 Source1:       %{name}.desktop
 Source2:       %{name}-icon.png
 Patch0:                %{name}-dynamic_id3lib.patch
 Patch1:                %{name}-helpfile_location.patch
 Patch2:                %{name}-not_require_lame-libs-devel.patch
-Patch3:                %{name}-wxGTK-2.3.2.patch
 URL:           http://audacity.sourceforge.net/
-Requires:      lame-libs
-BuildRequires: wxGTK-devel >= 2.3.2-10
-BuildRequires: mad-devel
-BuildRequires: libstdc++-devel
-BuildRequires: libvorbis-devel >= 1:1.0
-BuildRequires: libpng-devel
+BuildRequires: id3lib-devel
 BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
-BuildRequires: id3lib-devel
+BuildRequires: libvorbis-devel >= 1:1.0
+BuildRequires: mad-devel
+BuildRequires: wxGTK-devel >= 2.3.2-10
+Requires:      lame-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -40,13 +39,14 @@ Obs
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__autoconf}
 %configure \
-       --with-vorbis \
-       --with-libmad
+       --with-id3 \
+       --with-libmad \
+       --with-vorbis
+
 %{__make} CCC="g++ -fno-exceptions -fno-rtti"
 
 %install
@@ -64,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.txt LICENSE.txt
+%doc README.txt
 %attr(755,root,root) %{_bindir}/audacity
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}
 %{_applnkdir}/*/*
 %{_pixmapsdir}/*