From 77ba62c34dd84794cf0af84d2ed3e92eedc5e03b Mon Sep 17 00:00:00 2001 From: Gérard Milmeister Date: Jan 05 2007 20:51:47 +0000 Subject: new version 1.3.2 --- diff --git a/.cvsignore b/.cvsignore index d1ad8c4..c87ad17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audacity-src-1.2.6.tar.gz +audacity-src-1.3.2.tar.gz diff --git a/audacity-1.3.2-destdir.patch b/audacity-1.3.2-destdir.patch new file mode 100644 index 0000000..4ee1561 --- /dev/null +++ b/audacity-1.3.2-destdir.patch @@ -0,0 +1,11 @@ +--- audacity-src-1.3.2-beta/locale/Makefile.in.destdir 2007-01-05 21:48:15.000000000 +0100 ++++ audacity-src-1.3.2-beta/locale/Makefile.in 2007-01-05 21:48:29.000000000 +0100 +@@ -17,7 +17,7 @@ + INSTALL=@INSTALL@ + AUDACITY_NAME=@AUDACITY_NAME@ + ifdef DESTDIR +- INSTALL_PATH=$(top_srcdir)/$(DESTDIR) ++ INSTALL_PATH=$(DESTDIR) + else + INSTALL_PATH= + endif diff --git a/audacity.spec b/audacity.spec index 14378a0..a51ba89 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,15 +1,14 @@ Name: audacity -Version: 1.2.6 +Version: 1.3.2 Release: 1%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia License: GPL URL: http://audacity.sourceforge.net -Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.6.tar.gz +Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.3.2.tar.gz Source1: audacity.png -Patch1: audacity-1.2.2-aboutdialog.patch -Patch3: audacity-1.2.4b-missing-pango.patch +Patch4: audacity-1.3.2-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel BuildRequires: libvorbis-devel @@ -23,17 +22,12 @@ BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel BuildRequires: libid3tag-devel BuildRequires: desktop-file-utils -%{?_with_mp3:BuildRequires: libmad-devel} -%{?_with_gtk2:BuildRequires: compat-wxGTK2-devel} -%{!?_with_gtk2:BuildRequires: compat-wxGTK-devel} -# libwx_gtk2-2.4.so: undefined reference to `pango_x_get_context' -%{?_with_gtk2: BuildRequires: pango-devel} -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +BuildRequires: wxGTK2-devel +Requires(post): shared-mime-info, desktop-file-utils +Requires(postun): shared-mime-info, desktop-file-utils # Compile options: # --with mp3 : enable mp3 support -# --with gtk2 : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version # --with portaudiov19 : enable version 19 of portaudio (disables portmixer) @@ -46,9 +40,8 @@ and the audio I/O currently uses OSS under Linux. Audacity runs on Linux/*BSD, MacOS, and Windows. %prep -%setup -q -n %{name}-src-%{version} -%patch1 -p1 -b .aboutdialog -%{?_with_gtk2: %patch3 -p1 -b .missing-pango } +%setup -q -n %{name}-src-%{version}-beta +%patch4 -p1 -b .destdir cp -a src/Languages.cpp src/Languages.cpp.orig iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp @@ -61,17 +54,12 @@ perl -pi -e 's|^CXXFLAGS =|CXXFLAGS = -msse |' lib-src/soundtouch/source/SoundTo perl -pi -e 's|.define ALLOW_SSE.*||' lib-src/soundtouch/include/*.h %endif -%build -# Push a softlink into PATH so the renamed wx-config inside -# the compat-wxGTK2-devel package is found and taken. -%define mybindir __mybin__ -mkdir %{mybindir} -ln -s $(which wx-2.4-config) %{mybindir}/wx-config -export PATH=$(pwd)/%{mybindir}:$PATH +%build %configure --with-help --with-libsndfile=system --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system %{?_with_mp3:--with-libmad=system} %{?_with_portaudiov19:--with-portaudio=v19 --without-portmixer} make + %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install @@ -89,12 +77,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; +MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project; StartupWMClass=Audacity EOF - -desktop-file-install --vendor fedora \ - --add-category X-Fedora \ +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/* +desktop-file-install \ + --vendor fedora \ --add-category Application \ --add-category GNOME \ --add-category AudioVideo \ @@ -103,25 +91,35 @@ desktop-file-install --vendor fedora \ %{find_lang} %{name} + %clean rm -rf ${RPM_BUILD_ROOT} + %post -/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || : +%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : +%{_bindir}/update-desktop-database /usr/share/applications > /dev/null 2>&1 || : + %postun -/usr/bin/update-desktop-database /usr/share/applications > /dev/null 2>&1 || : +%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : +%{_bindir}/update-desktop-database /usr/share/applications > /dev/null 2>&1 || : + %files -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/audacity -%{_mandir}/*/* +%{_mandir}/man*/* %{_datadir}/applications/* %{_datadir}/pixmaps/* +%{_datadir}/mime/packages/* %doc %{_datadir}/doc/* %changelog +* Fri Jan 5 2007 Gerard Milmeister - 1.3.2-1 +- new version 1.3.2 + * Tue Jan 2 2007 Gerard Milmeister - 1.2.6-1 - new version 1.2.6 diff --git a/sources b/sources index 66d27b5..c984e7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5477ddca23592ae06cc3295f91961ec0 audacity-src-1.2.6.tar.gz +bf63673140254f1283dfd55b61ff2422 audacity-src-1.3.2.tar.gz