[wifi-radar/f12/master] Update to 2.0.s08

[Pablo Martin-Gomez]

commit 9fbd92f17a0a7cd31fdc9b0f903d8aa726404708
Author: bouska <bouska at fedoraproject.net>
Date:   Mon Nov 1 16:17:07 2010 +0100

    Update to 2.0.s08

 wifi-radar.spec |   96 ++++++++++++++++++++++++------------------------------
 1 files changed, 43 insertions(+), 53 deletions(-)
---
diff --git a/wifi-radar.spec b/wifi-radar.spec
index 4650205..8ee8013 100644
--- a/wifi-radar.spec
+++ b/wifi-radar.spec
@@ -1,25 +1,19 @@
 Name:		wifi-radar
 Summary:	A utility for managing WiFi profiles
-<<<<<<< HEAD
-Version:	1.9.9
-Release:	3%{?dist}
-# No version given.
-License:	GPL+
-=======
 Version:	2.0.s08
 Release:	1%{?dist}
 License:	GPLv2
->>>>>>> d22b481... Update to 2.0.s08
 Group:		Applications/Internet
-URL:		http://wifi-radar.systemimager.org/
-Source0:	http://wifi-radar.systemimager.org/pub/wifi-radar-%{version}.tar.bz2
-Source1:	fedora-wifi-radar.desktop
+URL:		http://wifi-radar.berlios.de/
+Source0:	http://download.berlios.de/wifi-radar/%{name}-%{version}.tar.bz2
 Source2:	wifi-radar-pam.d
+Patch0:		fedora-compliant.patch 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Requires:	pygtk2 net-tools wireless-tools dhclient usermode
 BuildRequires:	desktop-file-utils
 
+
 %description
 WiFi Radar is a straightforward utility, which scans for available wireless
 networks, and manages their associated profiles.
@@ -27,68 +21,65 @@ networks, and manages their associated profiles.
 %prep
 %setup -q
 
+# wifi-radar use by default dhcpcd instead of dhcpclient and look for 
+# the wpa_supplicant at the wrong location, so we need to fix that
+%patch0 -p1 -b .fedora
+
+#fix the upstream desktop file (this Ubuntu's fanboys tsss)
+sed -i 's/gksudo -S wifi-radar/wifi-radar/' %{name}.desktop
+sed -i 's/wifi-radar.svg/wifi-radar/' %{name}.desktop
+sed -i '/FilePattern=wifi-radar/d' %{name}.desktop
+
 %build
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-# An empty config file
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/wifi-radar
-touch $RPM_BUILD_ROOT/%{_sysconfdir}/wifi-radar/wifi-radar.conf
+
+make install DESTDIR=$RPM_BUILD_ROOT%{_prefix}
+
+# An empty config file
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}.conf
+
 # The actual executable
-mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-cp wifi-radar.localized $RPM_BUILD_ROOT/%{_sbindir}/wifi-radar
-# The symlink for normal users
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/wifi-radar
+ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/%{name}
+
 # consolehelper file
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
-cat > $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/wifi-radar <<EOF
+cat > $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/%{name} <<EOF
 USER=root
-PROGRAM=%{_sbindir}/wifi-radar
+PROGRAM=%{_sbindir}/%{name}
 SESSION=true
 EOF
+
 # PAM file
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
-cp %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wifi-radar
-# man pages
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-cp wifi-radar.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man5
-cp wifi-radar.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
-# Daemon init script
-#mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
-#cp init_script $RPM_BUILD_ROOT/%{_initrddir}/wifi-radar
-# Icons
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-cp pixmaps/wifi-radar.{png,svg} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
-# Desktop menus
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-#cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/applications/
-desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications	\
-	--add-category X-Fedora %{SOURCE1}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/%{name}
+
+desktop-file-install --delete-original --dir $RPM_BUILD_ROOT/%{_datadir}/applications	\
+	 $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
-%attr(0700,root,root) %dir %{_sysconfdir}/wifi-radar
-%attr(0600,root,root) %ghost %config(missingok,noreplace) %{_sysconfdir}/wifi-radar/wifi-radar.conf
-%attr(0755,root,root) %{_sbindir}/wifi-radar
-%{_bindir}/wifi-radar
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/wifi-radar
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/wifi-radar
-%attr(0644,root,root) %{_mandir}/man1/*
-%attr(0644,root,root) %{_mandir}/man5/*
-#%attr(0755,root,root) %{_initrddir}/wifi-radar
-%attr(0644,root,root) %{_datadir}/pixmaps/*
-%attr(0644,root,root) %{_datadir}/applications/fedora-wifi-radar.desktop
-%defattr(0644,root,root,0755)
-%doc COPYING DEVELOPER_GUIDELINES README TODO
+%defattr(-,root,root,-)
+%doc LICENSE.GPL docs/*
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}.conf
+%{_bindir}/%{name}
+%{_sbindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man?/%{name}.*
+%{_datadir}/pixmaps/%{name}.*
+
+
 
 %changelog
-<<<<<<< HEAD
-=======
 * Mon Nov 01 2010 Pablo Martin-Gomez <bouska at fedoraproject.org> -2.0.s08-1
 - Update to 2.0.s08
 
@@ -98,7 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 - The software can't be deamonize, so initscript is useless
 - Clean and recycle the spec file
 
->>>>>>> d22b481... Update to 2.0.s08
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild