- updated to 1.1.1, removed obsolete dynamic_id3lib patch

- updated helpfile_location,not_require_lame-libs-devel patches
- added system-expat,opt,segv patches

Changed files:
    audacity-dynamic_id3lib.patch -> 1.3
    audacity-helpfile_location.patch -> 1.2
    audacity-not_require_lame-libs-devel.patch -> 1.2
    audacity-opt.patch -> 1.1
    audacity-segv.patch -> 1.1
    audacity-system-expat.patch -> 1.1
    audacity.spec -> 1.19

diff --git a/audacity-dynamic_id3lib.patch b/audacity-dynamic_id3lib.patch
deleted file mode 100644 (file)
index 67d4efb..0000000
--- a/audacity-dynamic_id3lib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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=no]])],
-+              [compile with id3lib (libraries must be installed) [default=no]])],
-       use_id3lib=$withval,
-       use_id3lib="no")
- AC_ARG_WITH(help,
-@@ -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"
-+      LIBS="$LIBS -lid3"
-               
-       AC_DEFINE(USE_ID3LIB, 1,
-       [Define if id3lib is present])

diff --git a/audacity-helpfile_location.patch b/audacity-helpfile_location.patch
index 5e7170a04d227548acf30942e8d017c1de83c068..1b493ff2ce76e9cc32d513560e0ba80c8f7eb1e7 100644 (file)
--- a/audacity-helpfile_location.patch
+++ b/audacity-helpfile_location.patch
@@ -1,14 +1,11 @@
-diff -urN audacity-src-0.98.orig/Help.cpp audacity-src-0.98/Help.cpp
---- audacity-src-0.98.orig/Help.cpp    Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/Help.cpp Sat Feb  2 15:27:05 2002
-@@ -106,9 +106,7 @@
-       paths.Add(wxGetCwd() + wxFILE_SEP_PATH + "audacity-help.htb");
+--- audacity-src-1.1.1-3/src/Help.cpp.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/src/Help.cpp  Sat Jan 25 01:08:40 2003
+@@ -81,7 +81,7 @@
+       if (helpFiles.GetCount() > 0)
+          defaultLoc = helpFiles[0];
+       else
+-         defaultLoc = INSTALL_PREFIX "/share/doc/audacity/audacity-help.htb";
++         defaultLoc = INSTALL_PREFIX "/share/audacity/audacity-help.htb";
  
-       #ifdef __WXGTK__
--      paths.Add("/usr/local/share/doc/audacity/audacity-help.htb");
--      paths.Add("/usr/share/doc/audacity/audacity-help.htb");
--      paths.Add("/usr/share/audacity/audacity-help.htb"); // for debian
-+      paths.Add("/usr/X11R6/share/audacity/audacity-help.htb");
-       #endif
- 
-       #ifdef __WXMSW__
+       wxString helpFilePath =
+           gPrefs->Read("/Help/HelpFilePath", defaultLoc);

diff --git a/audacity-not_require_lame-libs-devel.patch b/audacity-not_require_lame-libs-devel.patch
index 522f8d392f36776347acb26d3d6b1f57c529ce7e..f23a0e782d50aa3c8517dd8710b5d81d04bd5ab9 100644 (file)
--- a/audacity-not_require_lame-libs-devel.patch
+++ b/audacity-not_require_lame-libs-devel.patch
@@ -1,18 +1,168 @@
-diff -urN audacity-src-0.98.orig/ExportMP3.cpp audacity-src-0.98/ExportMP3.cpp
---- audacity-src-0.98.orig/ExportMP3.cpp       Tue Jan 22 07:14:15 2002
-+++ audacity-src-0.98/ExportMP3.cpp    Sat Feb  2 15:59:19 2002
-@@ -212,12 +212,12 @@
-          
+--- audacity-src-1.1.1-3/src/export/ExportMP3.cpp.orig Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/src/export/ExportMP3.cpp      Sat Jan 25 01:10:38 2003
+@@ -224,12 +224,12 @@
+ 
           wxString GetLibraryName()
           {
 -            return "libmp3lame.so";
-+            return "libmp3lame.so.0.0.0";
++            return "libmp3lame.so.0";
           }
           
           wxString GetLibraryTypeString()
           {
--            return wxString("Shared Object files (*.so)|*.so");
-+            return wxString("Shared Object files (*.so*)|*.so*");
+-            return wxString(_("Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"));
++            return wxString(_("Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files (*)|*"));
           }
           
           wxString GetLibraryMessage()
+--- audacity-src-1.1.1-3/locale/bg.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/bg.po  Sat Jan 25 01:12:28 2003
+@@ -2106,11 +2106,11 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+-"Ñàìî libmp3lame.so|libmp3lame.so|Ñïîäåëåíè îáåêòíè ôàéëîâå "
+-"(*.so)|*.so|Âñè÷êè ôàéëîâå (*)|*"
++"Ñàìî libmp3lame.so*|libmp3lame.so*|Ñïîäåëåíè îáåêòíè ôàéëîâå "
++"(*.so*)|*.so*|Âñè÷êè ôàéëîâå (*)|*"
+ 
+ #: ../src/commands.h:214
+ msgid "Open"
+--- audacity-src-1.1.1-3/locale/da.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/da.po  Sat Jan 25 01:12:53 2003
+@@ -2161,10 +2161,10 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+-"Kun libmp3lame.so|libmp3lame.so|Delte objektifler (*.so)|*.so|All Files (*)|*"
++"Kun libmp3lame.so*|libmp3lame.so*|Delte objektifler (*.so*)|*.so*|All Files (*)|*"
+ 
+ #: ../src/commands.h:214
+ msgid "Open"
+--- audacity-src-1.1.1-3/locale/de.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/de.po  Sat Jan 25 01:13:07 2003
+@@ -2142,7 +2142,7 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+ 
+--- audacity-src-1.1.1-3/locale/es.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/es.po  Sat Jan 25 01:13:29 2003
+@@ -2092,10 +2092,10 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+-"Sólo libmp3lame.so|libmp3lame.so|Archivos Shared Object (*.so)|*.so|Todos "
++"Sólo libmp3lame.so*|libmp3lame.so*|Archivos Shared Object (*.so*)|*.so*|Todos "
+ "los Archivos (*)|*"
+ 
+ #: ../src/commands.h:214
+--- audacity-src-1.1.1-3/locale/fr.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/fr.po  Sat Jan 25 01:13:44 2003
+@@ -2068,7 +2068,7 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+ 
+--- audacity-src-1.1.1-3/locale/hu.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/hu.po  Sat Jan 25 01:13:58 2003
+@@ -2132,7 +2132,7 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+ 
+--- audacity-src-1.1.1-3/locale/it.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/it.po  Sat Jan 25 01:14:22 2003
+@@ -2091,10 +2091,10 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+-"Solo libmp3lame.so|libmp3lame.so|File oggetto condivisi(*.so)|*.so|Tutti i "
++"Solo libmp3lame.so*|libmp3lame.so*|File oggetto condivisi(*.so*)|*.so*|Tutti i "
+ "file (*)|*"
+ 
+ #: ../src/commands.h:214
+--- audacity-src-1.1.1-3/locale/nl.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/nl.po  Sat Jan 25 01:14:46 2003
+@@ -2095,10 +2095,10 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+-"Enkel libmp3lame.so|libmp3lame.so|Shared Object bestanden (*.so)|*.so|Alle "
++"Enkel libmp3lame.so*|libmp3lame.so*|Shared Object bestanden (*.so*)|*.so*|Alle "
+ "Bestanden (*)|*"
+ 
+ #: ../src/commands.h:214
+--- audacity-src-1.1.1-3/locale/pl.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/pl.po  Sat Jan 25 01:15:34 2003
+@@ -2100,10 +2100,10 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+-"Tylko libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Tylko libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ 
+ #: ../src/commands.h:214
+--- audacity-src-1.1.1-3/locale/ru.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/ru.po  Sat Jan 25 01:16:05 2003
+@@ -2105,7 +2105,7 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+ 
+--- audacity-src-1.1.1-3/locale/sl.po.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/locale/sl.po  Sat Jan 25 01:16:31 2003
+@@ -2102,10 +2102,10 @@
+ 
+ #: ../src/export/ExportMP3.cpp:232
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
++"Only libmp3lame.so*|libmp3lame.so*|Shared Object files (*.so*)|*.so*|All Files "
+ "(*)|*"
+ msgstr ""
+-"Samo libmp3lame.so|libmp3lame.so|Deljene Razredne datoteke (*.so)|*.so|Vse "
++"Samo libmp3lame.so*|libmp3lame.so*|Deljene Razredne datoteke (*.so*)|*.so*|Vse "
+ "datoteke (*)|*"
+ 
+ #: ../src/commands.h:214

diff --git a/audacity-opt.patch b/audacity-opt.patch
new file mode 100644 (file)
index 0000000..03861a6
--- /dev/null
+++ b/audacity-opt.patch
@@ -0,0 +1,33 @@
+--- audacity-src-1.1.1-3/lib-src/allegro/Makefile.in.orig      Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/lib-src/allegro/Makefile.in   Sat Jan 25 01:31:51 2003
+@@ -3,7 +3,7 @@
+ CC = @CC@
+ CCC = @CXX@
+ 
+-CFLAGS = -g -O
++CFLAGS = @CFLAGS@
+ OBJ = \
+       allegro.cpp.o \
+       allegrord.cpp.o \
+--- audacity-src-1.1.1-3/lib-src/libnyquist/Makefile.orig      Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/lib-src/libnyquist/Makefile   Sat Jan 25 01:33:47 2003
+@@ -6,7 +6,7 @@
+ INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
+ 
+ CC = cc
+-CFLAGS = -g -DCMTSTUFF -O2 -DEXT $(INCL)
++CFLAGS = $(OPTFLAGS) -DCMTSTUFF -DEXT $(INCL)
+ LN = $(CC)
+ LFLAGS = -lm
+ 
+--- audacity-src-1.1.1-3/lib-src/portaudio/pa_unix_oss/Makefile.orig   Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/lib-src/portaudio/pa_unix_oss/Makefile        Sat Jan 25 01:38:35 2003
+@@ -2,7 +2,7 @@
+ 
+ CC = gcc
+ 
+-CFLAGS = -g -O -ansi -I../pa_common
++CFLAGS = $(OPTFLAGS) -ansi -I../pa_common
+ PASRC = ../pa_common/pa_lib.c pa_unix_oss.c
+ PAINC = ../pa_common/portaudio.h
+ PAOBJ = ../pa_common/pa_lib.o pa_unix_oss.o

diff --git a/audacity-segv.patch b/audacity-segv.patch
new file mode 100644 (file)
index 0000000..bc6c975
--- /dev/null
+++ b/audacity-segv.patch
@@ -0,0 +1,12 @@
+--- audacity-src-1.1.1-3/src/Prefs.cpp.orig    Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/src/Prefs.cpp Sat Jan 25 02:43:25 2003
+@@ -116,7 +116,9 @@
+    if(prefsversion.CmpNoCase((wxString)AUDACITY_PREFS_VERSION_STRING))
+    {
+       // BG: Reset the prefs by removing them
++      if(gPrefs->HasGroup("/Keyboard"))
+       gPrefs->DeleteGroup("/Keyboard");
++      if(gPrefs->HasGroup("/Locale"))
+       gPrefs->DeleteGroup("/Locale");
+       gPrefs->Write("/PrefsVersion", (wxString)AUDACITY_PREFS_VERSION_STRING);
+    }

diff --git a/audacity-system-expat.patch b/audacity-system-expat.patch
new file mode 100644 (file)
index 0000000..ce7181b
--- /dev/null
+++ b/audacity-system-expat.patch
@@ -0,0 +1,33 @@
+--- audacity-src-1.1.1-3/configure.in.orig     Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/configure.in  Sat Jan 25 01:28:00 2003
+@@ -59,9 +59,7 @@
+ dnl Required sublibraries
+ dnl
+ 
+-BUILDLIBS="$BUILDLIBS expat/expat.a"
+-EXTRAOBJS="$EXTRAOBJS ../lib-src/expat/expat.a"
+-CXXFLAGS="$CXXFLAGS -I../lib-src/expat"
++LIBS="$LIBS -lexpat"
+ 
+ dnl TODO enable/disable allegro
+ BUILDLIBS="$BUILDLIBS allegro/allegro.a"
+@@ -372,7 +370,7 @@
+ 
+ AC_CONFIG_HEADER(src/configunix.h:src/configtemplate.h)
+ AC_CONFIG_FILES([Makefile src/Makefile lib-src/Makefile \
+-                                        lib-src/allegro/Makefile lib-src/expat/Makefile])
++                                        lib-src/allegro/Makefile])
+ 
+ AC_CONFIG_SUBDIRS([$SUBDIRS])
+ AC_OUTPUT
+--- audacity-src-1.1.1-3/src/xml/XMLFileReader.h.orig  Mon Nov 11 07:58:21 2002
++++ audacity-src-1.1.1-3/src/xml/XMLFileReader.h       Sat Jan 25 01:29:30 2003
+@@ -8,7 +8,7 @@
+ 
+ **********************************************************************/
+ 
+-#include "xmlparse/xmlparse.h"
++#include <expat.h>
+ 
+ #include "XMLTagHandler.h"
+ 

diff --git a/audacity.spec b/audacity.spec
index 2cb201c317a6ff1d999230bb13476c9ae4db3d3e..4849854a73fa91c86c56736dec6bf68b7976ba3e 100644 (file)
--- a/audacity.spec
+++ b/audacity.spec
@@ -1,31 +1,32 @@
 Summary:       Audacity - manipulate digital audio waveforms
 Summary(pl):   Audacity - narzêdzie do obróbki plików d¼wiêkowych
 Name:          audacity
-Version:       1.0.0
+Version:       1.1.1
+%define        subv    3
 Release:       1
 License:       GPL
 Vendor:                Dominic Mazzoni <dominic@minorninth.com>
 Group:         X11/Applications/Sound
-Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/%{name}/%{name}-src-%{version}.tgz
+Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/%{name}/%{name}-src-%{version}-%{subv}.tgz
 Source1:       %{name}.desktop
 Source2:       %{name}-icon.png
-Patch0:                %{name}-dynamic_id3lib.patch
+Patch0:                %{name}-system-expat.patch
 Patch1:                %{name}-helpfile_location.patch
 Patch2:                %{name}-not_require_lame-libs-devel.patch
+Patch3:                %{name}-opt.patch
+Patch4:                %{name}-segv.patch
 URL:           http://audacity.sourceforge.net/
 BuildRequires: autoconf
-BuildRequires: id3lib-devel
+BuildRequires: expat-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
+BuildRequires: libsndfile-devel
 BuildRequires: libstdc++-devel
-BuildRequires: libtiff-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)
 
-
 %description
 Audacity is a program that manipulates digital audio waveforms.
 Supports wav, mp3 and ogg/vorbis.
@@ -35,37 +36,48 @@ Audacity to program obs
 Obs³uguje .wav, .mp3 oraz ogg/vorbis.
 
 %prep
-%setup -q -n %{name}-src-%{version}
+%setup -q -n %{name}-src-%{version}-%{subv}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__autoconf}
 %configure \
-       --with-id3 \
-       --with-libmad \
-       --with-vorbis
+       --with-id3tag=system \
+       --with-libmad=system \
+       --with-libsndfile=system \
+       --with-vorbis=system
 
-%{__make} CCC="%{__cxx} -fno-exceptions -fno-rtti"
+%{__make} \
+       CCC="%{__cxx} -fno-exceptions -fno-rtti" \
+       OPTFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name},%{_applnkdir}/Multimedia,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_applnkdir}/Multimedia,%{_pixmapsdir}}
+
+%{__make} install \
+       PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_applnkdir}/Multimedia
-install %{SOURCE2} $RPM_BUILD_ROOT/%{_pixmapsdir}
+# not built in this version
+#install audacity-help.htb $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-install audacity $RPM_BUILD_ROOT%{_bindir}
-install audacity-help.htb $RPM_BUILD_ROOT%{_datadir}/%{name}
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README.txt
 %attr(755,root,root) %{_bindir}/audacity
 %{_datadir}/%{name}
+%{_mandir}/man1/*.1*
 %{_applnkdir}/*/*
 %{_pixmapsdir}/*