rpms/audacity-freeworld/F-12 .cvsignore, 1.5, 1.6 audacity-freeworld.spec, 1.11, 1.12 sources, 1.5, 1.6 audacity-1.3.6-flac-import.patch, 1.1, NONE audacity-1.3.7-audiodevdefaults.patch, 1.1, NONE audacity-1.3.7-portaudio-non-mmap-alsa.patch, 1.1, NONE audacity-1.3.7-repeat.patch, 1.1, NONE audacity-1.3.7-vamp-1.3.patch, 1.1, NONE

[David Timms]

Author: dtimms

Update of /cvs/free/rpms/audacity-freeworld/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14733

Modified Files:
	.cvsignore audacity-freeworld.spec sources 
Removed Files:
	audacity-1.3.6-flac-import.patch 
	audacity-1.3.7-audiodevdefaults.patch 
	audacity-1.3.7-portaudio-non-mmap-alsa.patch 
	audacity-1.3.7-repeat.patch audacity-1.3.7-vamp-1.3.patch 
Log Message:
- drop vamp-plugin path patch to suit updated vamp-plugin-sdk-2.1
- mods to ease diffs between builds for fedora and full
- really package new icons found in icons/hicolor
- mod tartopdir to use package version macro
- fix icons glob to use realname
- add more supported mimetypes and categories to the desktop file
- upgrade to 1.3.12-beta
- package new icons found in icons/hicolor



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 May 2009 13:38:58 -0000	1.5
+++ .cvsignore	18 Jul 2010 22:13:29 -0000	1.6
@@ -1 +1 @@
-audacity-minsrc-1.3.7.tar.bz2
+audacity-minsrc-1.3.12-beta.tar.bz2


Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-12/audacity-freeworld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- audacity-freeworld.spec	23 Oct 2009 06:29:58 -0000	1.11
+++ audacity-freeworld.spec	18 Jul 2010 22:13:29 -0000	1.12
@@ -1,31 +1,27 @@
-%define realname audacity
-Conflicts: %{realname}
-
 Name: audacity-freeworld
-Version: 1.3.7
-Release: 0.6.2.beta%{?dist}
+
+Version: 1.3.12
+Release: 0.6.beta%{?dist}
 Summary: Multitrack audio editor
-Group: Applications/Multimedia
+Group:   Applications/Multimedia
 License: GPLv2
-URL: http://audacity.sourceforge.net
+URL:     http://audacity.sourceforge.net
+
+%define tartopdir audacity-src-%{version}-beta
+%define realname audacity
+Conflicts: %{realname}
 
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-1.3.7.tar.bz2
+Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-beta.tar.bz2
 Source1: audacity.png
 Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
-Patch2: audacity-1.3.7-libdir.patch
-Patch3: audacity-1.3.6-flac-import.patch
-Patch4: audacity-1.3.7-portaudio-non-mmap-alsa.patch
-Patch5: audacity-1.3.7-repeat.patch
-Patch6: audacity-1.3.7-vamp-1.3.patch
-Patch7: audacity-1.3.7-audiodevdefaults.patch
-
-#Patch1: audacity-1.3.4-libdir.patch
-#Patch2: audacity-1.3.5-gcc43.patch
-#Patch3: audacity-1.3.4-libmp3lame-default.patch
-#Patch4: audacity-1.3.6-ffmpeg-lib-search-path.patch
-#Patch5: audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch
+Patch2: audacity-1.3.9-libdir.patch
+# add audio/x-flac
+# remove audio/mpeg, audio/x-mp3
+# enable startup notification
+# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
+Patch3: audacity-1.3.10-desktop.patch
 
 Provides: audacity-nonfree = %{version}-%{release}
 Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -34,14 +30,12 @@
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: expat-devel
-BuildRequires: ffmpeg-devel
 BuildRequires: flac-devel
 BuildRequires: gettext
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: ladspa-devel
-BuildRequires: lame-devel
 BuildRequires: libid3tag-devel
-BuildRequires: libmad-devel
+BuildRequires: taglib-devel
 BuildRequires: libogg-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
@@ -55,38 +49,34 @@
 BuildRequires: zip
 BuildRequires: zlib-devel
 BuildRequires: wxGTK-devel
+BuildRequires: libmad-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: lame-devel
 
 
 %description
 Audacity is a cross-platform multitrack audio editor. It allows you to
 record sounds directly or to import files in various formats. It features
- a few simple effects, all of the editing features you should need, and
+a few simple effects, all of the editing features you should need, and
 unlimited undo. The GUI was built with wxWidgets and the audio I/O
-supports PulseAudio,  OSS and ALSA under Linux.
-This build has support for mp3 and ffmpeg import/export. 
+supports PulseAudio, OSS and ALSA under Linux.
+This build has support for mp3 and ffmpeg import/export.
 
 
 %prep
-%setup -q -n audacity-src-%{version}
+%setup -q -n %{tartopdir}
 
 # Substitute hardcoded library paths.
 %patch1 -p1
 %patch2 -p1
 for i in src/effects/ladspa/LoadLadspa.cpp src/AudacityApp.cpp src/export/ExportMP3.cpp
-#lib-src/libvamp/vamp-hostsdk/PluginHostAdapter.cpp
 do
     sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
     sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%patch3 -p1 -b .dumb-flac-import
-%patch4 -p1 -b .pa-non-mmap-alsa
-%patch5 -p1 -b .repeat
-%if 0%{?fedora} < 11
-%patch6 -p1 -b .vamp-1.3
-%endif
-%patch7 -p1 -b .audiodevdefaults
+%patch3 -p1 -b .old-desktop-file
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -94,12 +84,6 @@
     sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
 done
 
-# clear executable permissions on src files that go to -debuginfo
-#chmod a-x lib-src/FileDialog/FileDialog.*
-#chmod a-x lib-src/FileDialog/gtk/FileDialogPrivate.*
-#chmod a-x src/FileIO.* src/UploadDialog.*
-#chmod a-x src/widgets/HtmlWindow.cpp src/widgets/ProgressDialog.*
-
 
 %build
 %configure \
@@ -114,7 +98,7 @@
     --with-expat=system \
     --with-soundtouch=system \
     --with-ffmpeg=system \
-    --with-libmad=system \
+    --with-libmad=system
 # _smp_mflags cause problems
 make
 
@@ -127,13 +111,17 @@
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
+# Audacity 1.3.8-beta complains if the help/manual directories
+# don't exist.
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual
+
 %{find_lang} %{realname}
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 desktop-file-install \
     --vendor fedora \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    %{SOURCE2}
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
 
 
 %clean
@@ -159,11 +147,44 @@
 %{_mandir}/man*/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/%{realname}.*
 %{_datadir}/mime/packages/*
 %doc %{_datadir}/doc/*
 
 
 %changelog
+* Thu Jul 15 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.6.beta
+- drop vamp-plugin path patch to suit updated vamp-plugin-sdk-2.1
+
+* Mon Jun 28 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.4.beta
+- mods to ease diffs between builds for fedora and full
+
+* Mon Jun 28 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.3.beta
+- really package new icons found in icons/hicolor
+
+* Mon Jun 28 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.2.beta
+- mod tartopdir to use package version macro
+
+* Mon Jun 28 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.1.3.beta
+- fix icons glob to use realname
+- add more supported mimetypes and categories to the desktop file
+
+* Mon Jun 28 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.1.2.beta
+- upgrade to 1.3.12-beta
+- package new icons found in icons/hicolor
+
+* Sat Dec  5 2009 David Timms <iinet.net.au at dtimms> - 1.3.10-0.1.1.beta
+- upgrade to 1.3.10-beta
+- re-base spec to fedora devel and patches by mschwendt 
+
+* Thu Dec  3 2009 David Timms <iinet.net.au at dtimms> - 1.3.9-0.4.2.beta
+- continue with upgrade to f12 version
+
+* Mon Nov 16 2009 David Timms <iinet.net.au at dtimms> - 1.3.9-0.4.1.beta
+- upgrade to 1.3.9-beta to match Fedora version.
+- resync to include new and updated patches from mschwendt 
+- add conditional freeworld to allow minimal change from Fedora version
+
 * Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 1.3.7-0.6.2.beta
 - Update desktop file according to F-12 FedoraStudio feature
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 May 2009 13:38:58 -0000	1.5
+++ sources	18 Jul 2010 22:13:29 -0000	1.6
@@ -1 +1 @@
-7dcbcd8ed417413fd824d446001058d9  audacity-minsrc-1.3.7.tar.bz2
+76996fec67181ca82ba191e012518b57  audacity-minsrc-1.3.12-beta.tar.bz2


--- audacity-1.3.6-flac-import.patch DELETED ---


--- audacity-1.3.7-audiodevdefaults.patch DELETED ---


--- audacity-1.3.7-portaudio-non-mmap-alsa.patch DELETED ---


--- audacity-1.3.7-repeat.patch DELETED ---


--- audacity-1.3.7-vamp-1.3.patch DELETED ---