rpms/audacity/FC-6 audacity-1.3.2-exportmp3.patch, NONE, 1.1 audacity-1.3.2-fr.patch, NONE, 1.1 audacity-1.3.2-languages.patch, NONE, 1.1 audacity.spec, 1.26, 1.27 audacity-1.2.2-aboutdialog.patch, 1.2, NONE audacity-1.2.4b-missing-pango.patch, 1.1, NONE

Sat Feb 24 13:49:08 UTC 2007

Author: mschwendt

Update of /cvs/extras/rpms/audacity/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23183

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.2-exportmp3.patch audacity-1.3.2-fr.patch 
	audacity-1.3.2-languages.patch 
Removed Files:
	audacity-1.2.2-aboutdialog.patch 
	audacity-1.2.4b-missing-pango.patch 
Log Message:
sync with devel:

* Sat Feb 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.2-8
- patch ExportMP3.cpp (MPEG-2 Layer III bitrates resulted in
  broken/empty files)
- convert locale related perl substitutions into patches (safer)
- configure with portaudio/portmixer defaults
- drop category Application from desktop file
- fix the libmp3lame.so.0 subst
- subst _libdir in libmp3lame search 
- use sed instead of perl


audacity-1.3.2-exportmp3.patch:

--- NEW FILE audacity-1.3.2-exportmp3.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/src/export/ExportMP3.cpp audacity-src-1.3.2-beta/src/export/ExportMP3.cpp
--- audacity-src-1.3.2-beta-orig/src/export/ExportMP3.cpp	2006-10-29 01:05:27.000000000 +0200
+++ audacity-src-1.3.2-beta/src/export/ExportMP3.cpp	2007-02-24 01:29:37.000000000 +0100
@@ -370,7 +370,7 @@
 
          lame_set_num_channels(mGF, channels);
          lame_set_in_samplerate(mGF, sampleRate);
-         lame_set_out_samplerate(mGF, sampleRate);
+         lame_set_out_samplerate(mGF, 0);
 
          lame_init_params(mGF);
 

audacity-1.3.2-fr.patch:

--- NEW FILE audacity-1.3.2-fr.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/locale/fr.po audacity-src-1.3.2-beta/locale/fr.po
--- audacity-src-1.3.2-beta-orig/locale/fr.po	2006-10-29 01:06:02.000000000 +0200
+++ audacity-src-1.3.2-beta/locale/fr.po	2007-02-15 23:28:47.000000000 +0100
@@ -17,7 +17,7 @@
 "Max spike width (higher is more sensitive)"
 msgstr ""
 "\n"
-"Largeur maximum du pic (la sensibilitŽ augmente avec la largeur)"
+"Largeur maximum du pic (la sensibilité augmente avec la largeur)"
 
 #: ../src/Menus.cpp:3703
 msgid ""
@@ -34,11 +34,11 @@
 msgstr ""
 "\n"
 " \n"
-"SŽlectionnez le seuil (la sensibilitŽ diminue avec le seuil)"
+"Sélectionnez le seuil (la sensibilité diminue avec le seuil)"
 
 #: ../src/widgets/AButton.cpp:181
 msgid " (disabled)"
-msgstr " (dŽsactivŽ)"
+msgstr " (désactivé)"
 
 #: ../src/import/Import.cpp:86
 msgid ""
@@ -82,14 +82,14 @@
 "\n"
 "It has been removed from the history list."
 msgstr ""
-"%s n'existe pas et ne peut tre ouvert.\n"
+"%s n'existe pas et ne peut être ouvert.\n"
 "\n"
-"Il a ŽtŽ retirŽ de l'historique."
+"Il a été retiré de l'historique."
 
 #: ../src/AudacityApp.cpp:279 ../src/Project.cpp:1891
 #, c-format
 msgid "%s is already open in another window."
-msgstr "%s est dŽjˆ ouvert dans une autre fentre."
+msgstr "%s est déjà ouvert dans une autre fenêtre."
 
 #  i18n-hint: This is the pattern for filenames that are created
 #  when a file needs to be backed up to a different name.  For
@@ -111,7 +111,7 @@
 
 #: ../src/Menus.cpp:328
 msgid "&All\tCtrl+A"
-msgstr "&Tout sŽlectionner\tCtrl+A"
+msgstr "&Tout sélectionner\tCtrl+A"
 
 #: ../src/Menus.cpp:563
 msgid "&Analyze"
@@ -127,7 +127,7 @@
 
 #: ../src/Menus.cpp:603
 msgid "&Contents..."
-msgstr "&Table des matires..."
+msgstr "&Table des matières..."
 
 #: ../src/Menus.cpp:294
 msgid "&Copy\tCtrl+C"
@@ -153,7 +153,7 @@
 #: ../src/Menus.cpp:751
 #, c-format
 msgid "&Export Selection As %s..."
-msgstr "&Exporter la sŽlection en %s..."
+msgstr "&Exporter la sélection en %s..."
 
 #: ../src/Menus.cpp:148
 msgid "&File"
@@ -161,11 +161,11 @@
 
 #: ../src/Menus.cpp:410
 msgid "&Fit in Window\tCtrl+F"
-msgstr "&Adapter ˆ la fentre\tCtrl+F"
+msgstr "&Adapter à la fenêtre\tCtrl+F"
 
 #: ../src/Menus.cpp:504
 msgid "&Generate"
-msgstr "&GŽnŽrer"
+msgstr "&Générer"
 
 #: ../src/Menus.cpp:598 ../src/Menus.cpp:601
 msgid "&Help"
@@ -205,11 +205,11 @@
 #: ../src/AudacityApp.cpp:532 ../src/Menus.cpp:387
 #, fuzzy
 msgid "&Preferences...\tCtrl+,"
-msgstr "&PrŽfŽrences...\tCtrl+P"
+msgstr "&Préférences...\tCtrl+P"
 
 #: ../src/Menus.cpp:391
 msgid "&Preferences...\tCtrl+P"
-msgstr "&PrŽfŽrences...\tCtrl+P"
+msgstr "&Préférences...\tCtrl+P"
 
 #: ../src/Menus.cpp:436
 msgid "&Project"
@@ -238,7 +238,7 @@
 
 #: ../src/Menus.cpp:299
 msgid "&Trim\tCtrl+T"
-msgstr "&Ne garder que la sŽlection\tCtrl+T"
+msgstr "&Ne garder que la sélection\tCtrl+T"
 
 #: ../src/Menus.cpp:271
 msgid "&Undo\tCtrl+Z"
@@ -259,7 +259,7 @@
 
 #: ../src/Menus.cpp:412
 msgid "&Zoom to Selection\tCtrl+E"
-msgstr "&Zoomer sur la sŽlection\tCtrl+E"
+msgstr "&Zoomer sur la sélection\tCtrl+E"
 
 #: ../src/TrackPanel.cpp:4847
 msgid "'left' channel"
@@ -278,7 +278,7 @@
 "(Not all combinations of headers\n"
 "and encodings are possible.)"
 msgstr ""
-"(Les combinaison d'entte\n"
+"(Les combinaison d'entête\n"
 "et d'encodage ne sont pas\n"
 "toutes possibles."
 
@@ -328,19 +328,19 @@
 
 #: ../src/prefs/GUIPrefs.cpp:391
 msgid "-145 dB (PCM range of 24 bit samples)"
-msgstr "-145 dB (amplitude PCM en Žchantillonnage 24 bits)"
+msgstr "-145 dB (amplitude PCM en échantillonnage 24 bits)"
 
 #: ../src/prefs/GUIPrefs.cpp:383
 msgid "-36 dB (shallow range for high-amplitude editing)"
-msgstr "-36 dB (pour Ždition de grande amplitude)"
+msgstr "-36 dB (pour édition de grande amplitude)"
 
 #: ../src/prefs/GUIPrefs.cpp:385
 msgid "-48 dB (PCM range of 8 bit samples)"
-msgstr "-48 dB (amplitude PCM en Žchantillonnage 8 bits)"
+msgstr "-48 dB (amplitude PCM en échantillonnage 8 bits)"
 
 #: ../src/prefs/GUIPrefs.cpp:387
 msgid "-96 dB (PCM range of 16 bit samples)"
-msgstr "-96 dB (amplitude PCM en Žchantillonnage 16 bits)"
+msgstr "-96 dB (amplitude PCM en échantillonnage 16 bits)"
 
 #: ../src/effects/ChangeLength.cpp:113 ../src/effects/ChangeLength.cpp:127
 #: ../src/effects/ChangeLength.cpp:162
@@ -357,19 +357,19 @@
 
 #: ../src/prefs/AudioIOPrefs.cpp:235
 msgid "2 (Stereo)"
-msgstr "2 (StŽrŽo)"
+msgstr "2 (Stéréo)"
 
 #: ../src/import/ImportRaw.cpp:361
 msgid "2 Channels (Stereo)"
-msgstr "2 Canaux (StŽrŽo)"
+msgstr "2 Canaux (Stéréo)"
 
 #: ../src/prefs/SpectrumPrefs.cpp:44
 msgid "256 - default"
-msgstr "256 - par dŽfaut"
+msgstr "256 - par défaut"
 
 #: ../src/prefs/SpectrumPrefs.cpp:48
 msgid "4096 - most narrowband"
-msgstr "4096 - bande plus Žtroite"
+msgstr "4096 - bande plus étroite"
 
 #: ../src/prefs/SpectrumPrefs.cpp:39
 #, fuzzy
@@ -382,7 +382,7 @@
 
 #: ../src/AboutDialog.cpp:186
 msgid "A Free Digital Audio Editor"
-msgstr "Un Žditeur audio numŽrique libre"
+msgstr "Un éditeur audio numérique libre"
 
 #: ../src/AboutDialog.cpp:100
 msgid "About Audacity..."
@@ -400,7 +400,7 @@
 #: ../src/TranscriptionToolBar.cpp:246
 #, fuzzy
 msgid "Add Label"
-msgstr "Marqueur ajoutŽ"
+msgstr "Marqueur ajouté"
 
 #: ../src/Menus.cpp:495
 msgid "Add Label At Playback Position\tCtrl+M"
@@ -408,16 +408,16 @@
 
 #: ../src/Menus.cpp:494
 msgid "Add Label At Selection\tCtrl+B"
-msgstr "Ajouter un marqueur ˆ  la sŽlection\tCtrl+B"
+msgstr "Ajouter un marqueur à  la sélection\tCtrl+B"
 
[...3345 lines suppressed...]
 #~ msgid "Recording time remaining: %d minutes"
-#~ msgstr "DurŽe d'enregistrement restante : %d minutes"
+#~ msgstr "Durée d'enregistrement restante : %d minutes"
 
 #~ msgid "Recording time remaining: %d seconds"
-#~ msgstr "DurŽe d'enregistrement restante : %d secondes"
+#~ msgstr "Durée d'enregistrement restante : %d secondes"
 
 #~ msgid "Selection: %.3lf - %.3lf (%.3lf NTSC frames)   %s"
-#~ msgstr "SŽlection : %.3lf - %.3lf (%.3lf images NTSC)   %s"
+#~ msgstr "Sélection : %.3lf - %.3lf (%.3lf images NTSC)   %s"
 
 #~ msgid "Selection: %.3lf - %.3lf (%.3lf PAL frames)   %s"
-#~ msgstr "SŽlection : %.3lf - %.3lf (%.3lf images PAL)   %s"
+#~ msgstr "Sélection : %.3lf - %.3lf (%.3lf images PAL)   %s"
 
 #~ msgid "Selection: %.3lf - %.3lf (%.3lf film frames)   %s"
-#~ msgstr "SŽlection : %.3lf - %.3lf (%.3lf film)   %s"
+#~ msgstr "Sélection : %.3lf - %.3lf (%.3lf film)   %s"
 
 #~ msgid ""
 #~ "Selection: %02i:%02i:%06.3lf - %02i:%02i:%06.3lf (%02i:%02i:%06.3lf cdda "
 #~ "min:sec:frames)   %s"
 #~ msgstr ""
-#~ "SŽlection : %02i:%02i:%06.3lf - %02i:%02i:%06.3lf (%02i:%02i:%06.3lf cdda "
+#~ "Sélection : %02i:%02i:%06.3lf - %02i:%02i:%06.3lf (%02i:%02i:%06.3lf cdda "
 #~ "min:sec:trames)   %s"
 
 #~ msgid ""
 #~ "Selection: %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
 #~ "06.3lf NTSC drop-frame h:mm:ss:ff) (%.3lf NTSC frames)   %s"
 #~ msgstr ""
-#~ "SŽlection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
+#~ "Sélection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
 #~ "06.3lf NTSC drop-frame h:mm:ss:ii) (%.3lf images NTSC)   %s"
 
 #~ msgid ""
 #~ "Selection: %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
 #~ "06.3lf NTSC non-drop-frame h:mm:ss:ff) (%.3lf NTSC frames)   %s"
 #~ msgstr ""
-#~ "SŽlection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
+#~ "Sélection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
 #~ "06.3lf NTSC non-drop-frame h:mm:ss:ii) (%.3lf images NTSC)   %s"
 
 #~ msgid ""
 #~ "Selection: %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
 #~ "06.3lf PAL h:mm:ss:ff) (%.3lf PAL frames)   %s"
 #~ msgstr ""
-#~ "SŽlection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
+#~ "Sélection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
 #~ "06.3lf PAL h:mm:ss:ff) (%.3lf images PAL)   %s"
 
 #~ msgid ""
 #~ "Selection: %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
 #~ "06.3lf film h:mm:ss:ff) (%.3lf film frames)   %s"
 #~ msgstr ""
-#~ "SŽlection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
+#~ "Sélection : %1i:%02i:%02i:%06.3lf - %1i:%02i:%02i:%06.3lf (%1i:%02i:%02i:%"
 #~ "06.3lf film h:mm:ss:ff) (%.3lf film)   %s"
 
 #~ msgid ""
 #~ "Selection: %1i:%02i:%09.6f - %1i:%02i:%09.6f (%1i:%02i:%09.6f hr:min:"
 #~ "sec)   %s"
 #~ msgstr ""
-#~ "SŽlection : %1i:%02i:%09.6f - %1i:%02i:%09.6f (%1i:%02i:%09.6f h:min:"
+#~ "Sélection : %1i:%02i:%09.6f - %1i:%02i:%09.6f (%1i:%02i:%09.6f h:min:"
 #~ "sec)   %s"
 
 #~ msgid ""
 #~ "Selection: %i+%04i - %i+%04i (%i+%04i cdda sectors+bytes)   [Snap-To "
 #~ "Samples]"
 #~ msgstr ""
-#~ "SŽlection : %i+%04i - %i+%04i (%i+%04i cdda secteurs+octets)   "
-#~ "[ˆ l'Žchantillon prs]"
+#~ "Sélection : %i+%04i - %i+%04i (%i+%04i cdda secteurs+octets)   "
+#~ "[à l'échantillon près]"
 
 #~ msgid ""
 #~ "Selection: %i+%04i - %i+%04i (%i+%04i cdda sectors+bytes)   [Snap-To "
 #~ "Samples]   Change Project Rate to 44100 for cdda"
 #~ msgstr ""
-#~ "SŽlection: %i+%04i - %i+%04i (%i+%04i cdda secteurs+octets)    "
-#~ "[ˆ l'Žchantillon prs]   Change l'Žchantillonnage du projet ˆ 44100 pour CDDA"
+#~ "Sélection: %i+%04i - %i+%04i (%i+%04i cdda secteurs+octets)    "
+#~ "[à l'échantillon près]   Change l'échantillonnage du projet à 44100 pour CDDA"
 
 #~ msgid "Selection: %i+%i - %i+%i (%i+%i sec+samples)   [Snap-To Samples]"
 #~ msgstr ""
-#~ "SŽlection: %i+%i - %i+%i (%i+%i sec+Žchantillons)   [ˆ l'Žchantillon prs]"
+#~ "Sélection: %i+%i - %i+%i (%i+%i sec+échantillons)   [à l'échantillon près]"
 
 #~ msgid ""
 #~ "Selection: %i:%02i+%i - %i:%02i+%i (%i:%02i+%i min:sec+samples)   [Snap-"
 #~ "To Samples]"
 #~ msgstr ""
-#~ "SŽlection: %i:%02i+%i - %i:%02i+%i (%i:%02i+%i min:sec+Žchantillons)    "
-#~ "[ˆ l'Žchantillon prs]"
+#~ "Sélection: %i:%02i+%i - %i:%02i+%i (%i:%02i+%i min:sec+échantillons)    "
+#~ "[à l'échantillon près]"
 
 #~ msgid "Selection: %i:%09.6f - %i:%09.6f (%i:%09.6f min:sec)   %s"
-#~ msgstr "SŽlection : %i:%09.6f - %i:%09.6f (%i:%09.6f min:sec)   %s"
+#~ msgstr "Sélection : %i:%09.6f - %i:%09.6f (%i:%09.6f min:sec)   %s"
 
 #~ msgid ""
 #~ "Selection: %i:%09.6lf - %i:%09.6lf (%i:%09.6lf min:sec)   [Snap-To "
 #~ "Samples]"
 #~ msgstr ""
-#~ "SŽlection : %i:%09.6lf - %i:%09.6lf (%i:%09.6lf min:sec)    [ˆ l'Žchantillon "
-#~ "prs]"
+#~ "Sélection : %i:%09.6lf - %i:%09.6lf (%i:%09.6lf min:sec)    [à l'échantillon "
+#~ "près]"
 
 #~ msgid "Selection: %lf - %lf (%lf sec)   %s"
-#~ msgstr "SŽlection : %lf - %lf (%lf sec)   %s"
+#~ msgstr "Sélection : %lf - %lf (%lf sec)   %s"
 
 #~ msgid "Selection: %lf - %lf (%lf sec)   [Snap-To Samples]"
-#~ msgstr "SŽlection : %lf - %lf (%lf sec)   [ˆ l'Žchantillon prs]"
+#~ msgstr "Sélection : %lf - %lf (%lf sec)   [à l'échantillon près]"
 
 #~ msgid "Selection: %li - %li (%li samples)   [Snap-To Samples]"
-#~ msgstr "SŽlection : %li - %li (%li Žchantillons)   [ˆ l'Žchantillon prs]"
+#~ msgstr "Sélection : %li - %li (%li échantillons)   [à l'échantillon près]"
 
 #~ msgid "Set Selection Format"
-#~ msgstr "Choisir un format de sŽlection "
+#~ msgstr "Choisir un format de sélection "
 
 #~ msgid ""
 #~ "The VU meters will now be disabled.\n"
@@ -6106,9 +6106,9 @@
 #~ "To enable them again, open the Preferences dialog and click on the "
 #~ "Interface tab."
 #~ msgstr ""
-#~ "Les VU mtres vont tre dŽsactivŽs.\n"
+#~ "Les VU mètres vont être désactivés.\n"
 #~ "\n"
-#~ "Pour les rŽactiver, ouvrez la bo”te de dialogue PrŽfŽrences et cliquez sur "
+#~ "Pour les réactiver, ouvrez la boîte de dialogue Préférences et cliquez sur "
 #~ "l'onglet Interface."
 
 #~ msgid ""
@@ -6118,21 +6118,21 @@
 #~ "into an existing project.  To open a project file,\n"
 #~ "select Open from the File menu.\n"
 #~ msgstr ""
-#~ "Le fichier sŽlectionnŽ est un projet Audacity.\n"
+#~ "Le fichier sélectionné est un projet Audacity.\n"
 #~ "\n"
-#~ "Seuls les fichiers audio peuvent tre importŽs dans un projet existant,\n"
+#~ "Seuls les fichiers audio peuvent être importés dans un projet existant,\n"
 #~ "pas les fichiers Projets.  Pour ouvrir un fichier Projet,\n"
 #~ "faites Ouvrir dans le menu Fichier.\n"
 
 #~ msgid "Time shift sequence"
-#~ msgstr "SŽquence de calage temporel"
+#~ msgstr "Séquence de calage temporel"
 
 #  i18n-hint: This snap-to string will appear in the status bar.
 #~ msgid "[Snap-To Off]"
-#~ msgstr "[SŽlection libre]"
+#~ msgstr "[Sélection libre]"
 
 #~ msgid "[Snap-To On]"
-#~ msgstr "[SŽlection par bloc]"
+#~ msgstr "[Sélection par bloc]"
 
 #  i18n-hint: fps is "frames per second",
 #  cdda is "Compact Disc Digital Audio - don't translate
@@ -6143,7 +6143,7 @@
 #  A "sector" is a technical term - don't translate unless you're sure
 #  you know the correct term.
 #~ msgid "cdda sectors+bytes (snap to samples)"
-#~ msgstr "CDDA secteurs+octets (ˆ l'Žchantillon prs)"
+#~ msgstr "CDDA secteurs+octets (à l'échantillon près)"
 
 #~ msgid "film h:mm:ss:ff 24 fps"
 #~ msgstr "film h:mm:ss:ii 24 i/s"
@@ -6155,16 +6155,16 @@
 #~ msgstr "min:sec"
 
 #~ msgid "min:sec+samples (snap to samples)"
-#~ msgstr "min:sec+Žchantillons (ˆ l'Žchantillon prs)"
+#~ msgstr "min:sec+échantillons (à l'échantillon près)"
 
 #~ msgid "samples (snap to samples)"
-#~ msgstr "Žchantillons (ˆ l'Žchantillon prs)"
+#~ msgstr "échantillons (à l'échantillon près)"
 
 #~ msgid "sec"
 #~ msgstr "sec"
 
 #~ msgid "sec (snap to samples)"
-#~ msgstr "sec (ˆ l'Žchantillon prs)"
+#~ msgstr "sec (à l'échantillon près)"
 
 #~ msgid "sec+samples (snap to samples)"
-#~ msgstr "sec+Žchantillons (ˆ l'Žchantillon prs)"
+#~ msgstr "sec+échantillons (à l'échantillon près)"

audacity-1.3.2-languages.patch:

--- NEW FILE audacity-1.3.2-languages.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/src/Languages.cpp audacity-src-1.3.2-beta/src/Languages.cpp
--- audacity-src-1.3.2-beta-orig/src/Languages.cpp	2006-10-29 01:05:28.000000000 +0200
+++ audacity-src-1.3.2-beta/src/Languages.cpp	2007-02-15 22:57:51.000000000 +0100
@@ -14,9 +14,9 @@
 
   Figure out what translations are installed and return a list
   of language codes (like "es", "fr", or "pt-br") and corresponding
-  language names (like "Español", "Français", and "Português").
+  language names (like "EspaÃ±ol", "FranÃ§ais", and "PortuguÃªs").
   We use our own list of translations of language names (i.e.
-  "Français" instead of "French") but we fallback on the language
+  "FranÃ§ais" instead of "French") but we fallback on the language
   name in wxWindows if we don't have it listed.
 
   This code is designed to work well with all of the current


Index: audacity.spec
===================================================================
RCS file: /cvs/extras/rpms/audacity/FC-6/audacity.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- audacity.spec	18 Feb 2007 21:04:59 -0000	1.26
+++ audacity.spec	24 Feb 2007 13:48:35 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -8,6 +8,11 @@
 URL:            http://audacity.sourceforge.net
 Source:         http://dl.sf.net/sourceforge/audacity/audacity-src-%{version}.tar.gz
 Source1:        audacity.png
+# iconv on src/Languages.cpp (ISO Latin-1 to UTF-8)
+Patch1:         audacity-1.3.2-languages.patch
+# iconv on locale/fr.po (MAC to ISO Latin-1)
+Patch2:         audacity-1.3.2-fr.patch
+Patch3:         audacity-1.3.2-exportmp3.patch
 Patch4:         audacity-1.3.2-destdir.patch
 Patch5:         audacity-1.3.2-resample.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,7 +28,6 @@
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  libvorbis-devel
-BuildRequires:  perl
 BuildRequires:  wxGTK2-devel
 BuildRequires:  zip
 BuildRequires:  zlib-devel
@@ -46,23 +50,31 @@
 
 %prep
 %setup -q -n %{name}-src-%{version}-beta
+%patch1 -p1 -b .languages
+%patch2 -p1 -b .fr
+%patch3 -p1 -b .exportmp3
 %patch4 -p1 -b .destdir
 %patch5 -p1 -b .resample
-cp -a src/Languages.cpp src/Languages.cpp.orig
-iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp
-cp -a locale/fr.po locale/fr.po.orig
-iconv -f MAC -t ISO_8859-1 locale/fr.po.orig > locale/fr.po
+
+# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
 do
-   perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i
+    sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
+done
+
+# Substitute hardcoded /usr/lib paths.
+for i in src/AudacityApp.cpp src/export/ExportMP3.cpp
+do
+    sed -i -e 's!/usr/lib!%{_libdir}!g' $i
 done
+
 %ifnarch %{ix86} x86_64
-perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.*
+sed -i -e 's!-msse!!' lib-src/soundtouch/source/SoundTouch/Makefile.*
 %endif
 
 
 %build
-%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system --with-portaudio=v19 --without-portmixer %{?_with_mp3:--with-libmad=system} 
+%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system %{?_with_mp3:--with-libmad=system} 
 make
 
 
@@ -82,14 +94,12 @@
 Terminal=false
 Comment=A multitrack audio editor
 Encoding=UTF-8
-X-Desktop-File-Install-Version=0.4
 MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
 StartupWMClass=Audacity
 EOF
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*
 desktop-file-install \
     --vendor fedora \
-    --add-category Application \
     --add-category GNOME \
     --add-category AudioVideo \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -122,7 +132,18 @@
 %{_datadir}/mime/packages/*
 %doc %{_datadir}/doc/*
 
+
 %changelog
+* Sat Feb 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.2-8
+- patch ExportMP3.cpp (MPEG-2 Layer III bitrates resulted in
+  broken/empty files)
+- convert locale related perl substitutions into patches (safer)
+- configure with portaudio/portmixer defaults
+- drop category Application from desktop file
+- fix the libmp3lame.so.0 subst
+- subst _libdir in libmp3lame search 
+- use sed instead of perl
+
 * Sun Feb 18 2007 Gerard Milmeister <gemi at bluewin.ch> - 1.3.2-7
 - added patch for compiling with libsamplerate
 


--- audacity-1.2.2-aboutdialog.patch DELETED ---


--- audacity-1.2.4b-missing-pango.patch DELETED ---


