rpms/audacity/devel audacity-1.3.10-desktop.patch, NONE, 1.1 audacity.spec, 1.90, 1.91 audacity.desktop, 1.5, NONE

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29190/devel

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.10-desktop.patch 
Removed Files:
	audacity.desktop 
Log Message:
* Thu Jan 21 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.4.beta
- Add audio/x-flac to .desktop file (#557335).
- Create fresh .desktop file patch. Enable startup notification.


audacity-1.3.10-desktop.patch:
 audacity.desktop |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE audacity-1.3.10-desktop.patch ---
diff -Nur audacity-src-1.3.10-orig/src/audacity.desktop audacity-src-1.3.10/src/audacity.desktop
--- audacity-src-1.3.10-orig/src/audacity.desktop	2009-12-01 20:32:08.000000000 +0100
+++ audacity-src-1.3.10/src/audacity.desktop	2010-01-21 10:29:58.667825990 +0100
@@ -12,9 +12,10 @@
 Icon=audacity
 
 Type=Application
-Categories=AudioVideo;Audio;AudioVideoEditing;
+Categories=AudioVideo;Audio;AudioVideoEditing;Sequencer;X-Jack;
 
 Exec=audacity
-StartupNotify=false
+StartupNotify=true
+StartupWMClass=Audacity
 Terminal=false
-MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
+MimeType=application/ogg;audio/basic;audio/x-aiff;audio/x-wav;application/x-audacity-project;audio/x-flac;


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- audacity.spec	9 Jan 2010 15:41:51 -0000	1.90
+++ audacity.spec	21 Jan 2010 11:44:44 -0000	1.91
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.10
-Release: 0.3.beta%{?dist}
+Release: 0.4.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -13,12 +13,18 @@ URL: http://audacity.sourceforge.net
 
 Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.tar.bz2
 Source1: audacity.png
-Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.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
 Patch6: audacity-1.3.7-vamp-1.3.patch
+# obsolete with version upgrade
 Patch7: audacity-1.3.9-getmaxpeak.patch
+# obsolete with version upgrade
 Patch8: audacity-1.3.10-resample.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -68,6 +74,7 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
+%patch3 -p1 -b .old-desktop-file
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
@@ -113,11 +120,11 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{na
 
 %{find_lang} %{name}
 
-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
@@ -148,6 +155,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Jan 21 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.4.beta
+- Add audio/x-flac to .desktop file (#557335).
+- Create fresh .desktop file patch. Enable startup notification.
+
 * Sat Jan  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.3.beta
 - Merge improved resample patch from Richard Ash.
 


--- audacity.desktop DELETED ---