From e37d8982f92110375470e75fb6a50984d4ea2aff5400f1a7c30929577db0d45d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 20 May 2009 01:10:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=16 --- audacity-1.3.7-desktop_file.patch | 22 +++++++++++++ audacity.changes | 7 ++++ audacity.desktop | 7 ---- audacity.png | 4 +-- audacity.spec | 55 ++++++++++++++++++++++--------- 5 files changed, 71 insertions(+), 24 deletions(-) create mode 100644 audacity-1.3.7-desktop_file.patch delete mode 100644 audacity.desktop diff --git a/audacity-1.3.7-desktop_file.patch b/audacity-1.3.7-desktop_file.patch new file mode 100644 index 0000000..c30a543 --- /dev/null +++ b/audacity-1.3.7-desktop_file.patch @@ -0,0 +1,22 @@ +--- 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 diff --git a/audacity.changes b/audacity.changes index 86f25a3..81a7ace 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 11 23:08:12 CEST 2009 - cmorve69@yahoo.es + +- removed unneeded BuildRequires +- make ffmpeg, mad and twolame support build options +- use upstream .desktop file + ------------------------------------------------------------------- Wed Apr 8 16:55:49 CEST 2009 - mseben@suse.cz diff --git a/audacity.desktop b/audacity.desktop deleted file mode 100644 index 3774326..0000000 --- a/audacity.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Audacity -GenericName=Audio Editor -Comment=A free, cross-platform digital audio editor -Exec=audacity -Icon=audacity diff --git a/audacity.png b/audacity.png index 46608ac..51160ff 100644 --- a/audacity.png +++ b/audacity.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16b6365b41356ceda601af31ee166ff713291b59fc34ab0bf7dd4512424b6c48 -size 2157 +oid sha256:5af20a7bfc8c65f5ca71a3a0911d493ba39ff5a25d7b87b3af1f9d9ccd15531d +size 2127 diff --git a/audacity.spec b/audacity.spec index 2793184..4aefde9 100644 --- a/audacity.spec +++ b/audacity.spec @@ -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 @@ Patch6: %{name}-%{version}-strict-aliasing.patch #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 @@ Authors: %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 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mime/packages/audacity.xml %changelog +* Mon May 11 2009 cmorve69@yahoo.es +- removed unneeded BuildRequires +- make ffmpeg, mad and twolame support build options +- use upstream .desktop file * Wed Apr 08 2009 mseben@suse.cz - added wxGTK_with_stl.patch to fix build issues when linking wxGTK configured with --enable-stl flag