From 971f9d6b0a464d4d3e3820afeac921a81ea9aa44 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Sep 17 2005 21:31:56 +0000
Subject: Don't bother messing with the existing desktop file, use a known good copy.


---

diff --git a/wlassistant.desktop b/wlassistant.desktop
new file mode 100644
index 0000000..da99bc0
--- /dev/null
+++ b/wlassistant.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Wireless Assistant
+Comment[pl]=Program do obsługi sieci bezprzewodowych
+Comment[es]=Aplicación para buscar redes inalámbricas
+Comment=Application to look for wireless networks
+Exec=/usr/sbin/wlassistant
+Icon=/usr/share/icons/hicolor/32x32/apps/wlassistant.png
+Type=Application
+Categories=Application;SystemSetup;System;
+StartupNotify=true
+
diff --git a/wlassistant.spec b/wlassistant.spec
index b7f6b91..7045082 100644
--- a/wlassistant.spec
+++ b/wlassistant.spec
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.4a
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -8,13 +8,13 @@ URL:		http://wlassistant.sourceforge.net
 Source0:	http://download.sourceforge.net/wlassistant/wlassistant-%{version}.tar.bz2
 Source1:	wlassistant.console_apps
 Source2:	wlassistant.pamd
+Source3:	wlassistant.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdebase-devel, desktop-file-utils, dos2unix, wireless-tools
+BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:       usermode, wireless-tools, net-tools, dhclient
 Patch0:		wlassistant-0.5.4a-rpath.patch
-Patch1:		wlassistant-0.5.4a-desktopfix.patch
 
 %description
 Wireless Assistant (wlassistant) is a small application that allows you to 
@@ -30,7 +30,6 @@ MAIN FEATURES:
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -46,13 +45,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/wlassistant
 install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/wlassistant
 
-dos2unix $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
 
 desktop-file-install --vendor fedora \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category X-Fedora \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/wlassistant.desktop
+	%{SOURCE3}
 
 %find_lang %{name}
 
@@ -83,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Sat Sep 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.4a-3
+- use .desktop file as SOURCE3 rather than screwing around with dos2unix
+
 * Sat Sep 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.4a-2
 - add BR: wireless-tools