rpms/NetworkManager/devel NetworkManager.spec,1.299,1.300

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	NetworkManager.spec 
Log Message:
* Tue Feb 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.8-0.3.git20100129
- don't autostart in KDE on F13+ (#541353)
- validate the autostart .desktop file


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- NetworkManager.spec	30 Jan 2010 00:23:00 -0000	1.299
+++ NetworkManager.spec	9 Feb 2010 15:20:40 -0000	1.300
@@ -18,7 +18,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.0
-Release: 0.2%{snapshot}%{?dist}
+Release: 0.3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -81,6 +81,7 @@ BuildRequires: libudev-devel
 BuildRequires: libuuid-devel
 BuildRequires: libgudev1-devel >= 143
 BuildRequires: cmake
+BuildRequires: desktop-file-utils
 # No bluetooth on s390
 %ifnarch s390 s390x
 BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
@@ -238,6 +239,14 @@ install -m 0755 test/.libs/nm-online %{b
 %{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
 %{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
 
+# don't autostart in KDE on F13+ (#541353)
+%if 0%{?fedora} > 12
+echo 'NotShowIn=KDE;' >>$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
+%endif
+
+# validate the autostart .desktop file
+desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
+
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -380,6 +389,10 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue Feb 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.8-0.3.git20100129
+- don't autostart in KDE on F13+ (#541353)
+- validate the autostart .desktop file
+
 * Fri Jan 29 2010 Dan Williams <dcbw at redhat.com> - 0.8-0.2.git20100129
 - core: add Bluetooth Dial-Up Networking (DUN) support (rh #136663)
 - core: start DHCPv6 on receipt of RA 'otherconf'/'managed' bits