- changed .wmconfig to .desktop

Changed files:
    SoundStudio.desktop -> 1.1
    SoundStudio.spec -> 1.8
    SoundStudio.wmconfig -> 1.2

diff --git a/SoundStudio.desktop b/SoundStudio.desktop
new file mode 100644 (file)
index 0000000..c281186
--- /dev/null
+++ b/SoundStudio.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=SoundStudio
+Comment=SOX interface
+Exec=/usr/bin/studio
+Terminal=0
+Icon=mail2.xpm
+Type=Application
+# vi: encoding=utf-8

diff --git a/SoundStudio.spec b/SoundStudio.spec
index d71993f4596b8f2976c8d0cb32562df670b5f5d4..48025359a408a3cdc3238c41c55445be5e44f036 100644 (file)
--- a/SoundStudio.spec
+++ b/SoundStudio.spec
@@ -3,12 +3,12 @@ Summary(pl):  Edytor d
 Name:          SoundStudio
 Version:       1.0.5
 Release:       1
+License:       GPL
 Group:         Applications/Sound
 Group(de):     Applikationen/Laut
 Group(pl):     Aplikacje/D¼wiêk
-License:       GPL
 Source0:       http://prdownloads.sourceforge.net/studio/%{name}-%{version}.tar.gz
-Source1:       %{name}.wmconfig
+Source1:       %{name}.desktop
 Source2:       studio.xpm
 Patch0:                %{name}.patch
 URL:           http://studio.sourceforge.net/
@@ -42,15 +42,14 @@ MYFILES=%{_libdir}/%{name} SOX_DIR=/usr/bin OPT="%{rpmcflags}" ./build default
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_libdir}/%{name},%{_bindir}}
+       $RPM_BUILD_ROOT{_applnkdir}/Multimedia
+
 install studio reset_dsp $RPM_BUILD_ROOT%{_bindir}
 install fader maxmin studio_mixer studio_tool $RPM_BUILD_ROOT%{_libdir}/%{name}
 install *.tk *.ico $RPM_BUILD_ROOT%{_libdir}/%{name}
 install help1.hlp v12.au StudioHelp $RPM_BUILD_ROOT%{_libdir}/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/mini/studio.xpm
-
-# change it to .desktop
-#install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/wmconfig
-#install $RPM_SOURCE_DIR/SoundStudio.wmconfig $RPM_BUILD_ROOT%{_sysconfdir}/X11/wmconfig/SoundStudio
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
 
 gzip -9nf README
 
@@ -73,4 +72,4 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/%{name}/*.au
 %{_libdir}/%{name}/StudioHelp
 %{_pixmapsdir}/mini/studio.xpm
-#%{_sysconfdir}/X11/wmconfig/SoundStudio
+%{_applnkdir}/Multimedia/SoundStudio.desktop

diff --git a/SoundStudio.wmconfig b/SoundStudio.wmconfig
deleted file mode 100644 (file)
index 00ea791..0000000
--- a/SoundStudio.wmconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-SoundStudio name "SoundStudio"
-SoundStudio description "SOX interface"
-SoundStudio icon mail2.xpm
-SoundStudio mini-icon studio.xpm
-SoundStudio exec "/usr/bin/studio &"
-SoundStudio group Utilities/Sound