rpms/lash/devel lash-panel.desktop,NONE,1.1 lash.spec,1.24,1.25

[Orcan Ogetbil]

Author: oget

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

Modified Files:
	lash.spec 
Added Files:
	lash-panel.desktop 
Log Message:
* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5.4-8
- Update .desktop file



--- NEW FILE lash-panel.desktop ---
[Desktop Entry]
Name=LASH Panel
GenericName=LASH Control Panel
Comment=LASH Control Panel
Icon=lash
Exec=lash_panel
Terminal=false
Type=Application
Categories=AudioVideo;X-Lash;X-Jack;X-AudioVideoTools;


Index: lash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lash/devel/lash.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- lash.spec	25 Jul 2009 04:57:31 -0000	1.24
+++ lash.spec	6 Aug 2009 00:57:50 -0000	1.25
@@ -3,11 +3,12 @@
 Summary:      LASH Audio Session Handler
 Name:         lash
 Version:      0.5.4
-Release:      7%{?dist}
+Release:      8%{?dist}
 License:      GPLv2+
 Group:        System Environment/Libraries
 URL:          http://www.nongnu.org/lash/
 Source0:      http://download.savannah.gnu.org/releases/lash/lash-%{version}.tar.gz
+Source1:      %{name}-panel.desktop
 Patch0:       lash-0.5.3-no-static-lib.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +22,7 @@ BuildRequires: readline-devel
 BuildRequires: swig
 BuildRequires: texi2html
 
-%if 0%{?fedora} < 11
+%if 0%{?fedora} < 12
 BuildRequires: e2fsprogs-devel
 %else
 BuildRequires: libuuid-devel
@@ -41,7 +42,7 @@ Requires:     alsa-lib-devel
 Requires:     jack-audio-connection-kit-devel
 Requires:     pkgconfig
 
-%if 0%{?fedora} < 11
+%if 0%{?fedora} < 12
 Requires:     e2fsprogs-devel
 %else
 Requires:     libuuid-devel
@@ -102,22 +103,10 @@ mv %{buildroot}%{_datadir}/lash/dtds/las
 rm -rf %{buildroot}%{_datadir}/lash
 
 # install the desktop entry
-cat << EOF > %{name}-panel.desktop
-[Desktop Entry]
-Name=LASH Panel
-GenericName=LASH Control Panel
-Comment=LASH Control Panel
-Icon=lash.png
-Exec=%{_bindir}/lash_panel
-Terminal=false
-Type=Application
-EOF
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora              \
+desktop-file-install --vendor fedora         \
   --dir %{buildroot}%{_datadir}/applications \
-  --add-category X-Fedora                         \
-  --add-category AudioVideo                       \
-  lash-panel.desktop
+  %{SOURCE1}
 
 # Work around the newer texi2html which is behaving somehow else
 if [ ! -d docs/lash-manual-html-split/lash-manual/ ]; then
@@ -171,6 +160,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/lash.py*
 
 %changelog
+* Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.5.4-8
+- Update .desktop file
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild