Mailinglist Archive: opensuse-commit (754 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package audacity for openSUSE:Factory
checked in at Wed May 20 03:10:41 CEST 2009.



--------
--- audacity/audacity.changes   2009-04-08 17:02:16.000000000 +0200
+++ audacity/audacity.changes   2009-05-11 23:10:23.000000000 +0200
@@ -1,0 +2,7 @@
+Mon May 11 23:08:12 CEST 2009 - cmorve69@xxxxxxxx
+
+- removed unneeded BuildRequires
+- make ffmpeg, mad and twolame support build options
+- use upstream .desktop file
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  audacity.desktop

New:
----
  audacity-1.3.7-desktop_file.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ audacity.spec ++++++
--- /var/tmp/diff_new_pack.Dp8190/_old  2009-05-20 03:10:04.000000000 +0200
+++ /var/tmp/diff_new_pack.Dp8190/_new  2009-05-20 03:10:04.000000000 +0200
@@ -16,22 +16,32 @@
 #
 
 
+%bcond_with ffmpeg
+%bcond_with mad
+%bcond_with twolame
 
 Name:           audacity
-BuildRequires:  SDL-devel flac-devel gcc-c++ glib-devel id3lib-devel jack-devel
-BuildRequires:  libexpat-devel libid3tag-devel libmspack-devel 
libsamplerate-devel
-BuildRequires:  libsndfile-devel libtiff-devel libvorbis-devel soundtouch-devel
-BuildRequires:  unixODBC-devel update-desktop-files wxGTK-devel zip
-%define DISTRIBUTABLE 1
+BuildRequires:  flac-devel gcc-c++ glib-devel jack-devel libexpat-devel
+BuildRequires:  libid3tag-devel libsamplerate-devel libsndfile-devel
+BuildRequires:  libvorbis-devel soundtouch-devel update-desktop-files
+BuildRequires:  wxGTK-devel
+%if %{with ffmpeg}
+BuildRequires:  libffmpeg-devel
+%endif
+%if %{with mad}
+BuildRequires:  libmad-devel
+%endif
+%if %{with twolame}
+BuildRequires:  libtwolame-devel
+%endif
 Summary:        A Free, Cross-Platform Digital Audio Editor
 Version:        1.3.7
-Release:        2
+Release:        3
 License:        GPL v2 or later
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://audacity.sourceforge.net/
 Source:         %{name}-minsrc-%{version}.tar.bz2
-Source1:        %{name}.desktop
 Source2:        %{name}.png
 #PATCH-FIX-OPENSUSE return_non_void.patch fixed non-void return value 
(bnc#477654)
 Patch1:         %{name}-%{version}-return_non_void.patch
@@ -42,6 +52,7 @@
 #PATCH-FIX-UPSTREAM fix build issues when linked wxGTK configured with 
--enable-stl flag
 Patch8:         %{name}-%{version}-wxGTK_with_stl.patch
 Patch9:         %{name}-%{version}-modal-help-dialog.patch
+Patch10:        %{name}-%{version}-desktop_file.patch
 
 %description
 Audacity is a program that manipulates digital audio wave forms. In
@@ -77,29 +88,39 @@
 %patch6
 %patch8
 %patch9
+%patch10
 
 %build
 %{?suse_update_config:%{suse_update_config -f . lib-src/*/.}}
 export AUTOMAKE="automake --foreign"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure \
     --enable-unicode \
-    --with-vorbis=system \
-%if %DISTRIBUTABLE
-    --without-libmad \
+    --with-libvorbis=system \
+%if %{with ffmpeg}
+    --with-ffmpeg=system \
 %else
+    --without-ffmpeg \
+%endif
+%if %{with mad}
     --with-libmad=system \
+%else
+    --without-libmad \
+%endif
+%if %{with twolame}
+    --with-libtwolame=system \
+%else
+    --without-libtwolame \
 %endif
     --with-libsndfile=system \
-    --with-flac=system \
-    --with-id3tag=system \
+    --with-libflac=system \
+    --with-libid3tag=system \
     --with-libsamplerate=system \
     --with-portaudio=v19
-make
+make %{?jobs:-j %jobs}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-%suse_update_desktop_file -i audacity AudioVideo AudioVideoEditing
+%suse_update_desktop_file audacity
 install -d -m755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 # we will add docs later in %files section
@@ -120,6 +141,10 @@
 %{_datadir}/mime/packages/audacity.xml
 
 %changelog
+* Mon May 11 2009 cmorve69@xxxxxxxx
+- removed unneeded BuildRequires
+- make ffmpeg, mad and twolame support build options
+- use upstream .desktop file
 * Wed Apr 08 2009 mseben@xxxxxxx
 - added wxGTK_with_stl.patch to fix build issues when linking wxGTK
   configured with --enable-stl flag

++++++ audacity-1.3.7-desktop_file.patch ++++++
--- src/audacity.desktop
+++ src/audacity.desktop
@@ -1,6 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
-
 Name=Audacity Sound Editor
 Name[de]=Audacity Audio-Editor
 Name[ru]=Audacity
@@ -11,10 +9,10 @@
 Comment[de]=Audio-Dateien aufnehmen und bearbeiten
 Comment[ru]=Запись и редактирование звуковых файлов
 
-Icon=/usr/share/audacity/audacity.xpm
+Icon=audacity
 
 Type=Application
-Categories=Application;AudioVideo;Audio;AudioVideoEditing;
+Categories=AudioVideo;Audio;AudioVideoEditing;
 
 Exec=audacity
 StartupNotify=false
++++++ audacity.png ++++++
Files audacity/audacity.png and audacity/audacity.png differ


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx