rpms/bluez-gnome/devel bluez-gnome.spec,1.18,1.19

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27087

Modified Files:
	bluez-gnome.spec 
Log Message:
* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-4
- Only show and start the bluez-gnome bits in GNOME (#258721)



Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bluez-gnome.spec	17 Sep 2007 23:19:26 -0000	1.18
+++ bluez-gnome.spec	20 Sep 2007 12:44:33 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	0.14
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -40,18 +40,19 @@
 
 %prep
 %setup -q
-sed -i /^OnlyShowIn=/d applet/bluetooth-applet.desktop.in
 
 %build
 %configure --disable-mime-update --disable-desktop-update
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/gnome/
+mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ $RPM_BUILD_ROOT%{_sysconfdir}/xdg/gnome/
+
 desktop-file-install --vendor=""				\
 	--add-category=X-GNOME-NetworkSettings			\
 	--delete-original					\
@@ -105,7 +106,7 @@
 %{_bindir}/bluetooth-applet
 %{_bindir}/bluetooth-properties
 %config %{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
+%{_sysconfdir}/xdg/gnome/autostart/bluetooth-applet.desktop
 %{_datadir}/man/man1/bluetooth-applet.1.gz
 %{_datadir}/man/man1/bluetooth-properties.1.gz
 %{_datadir}/applications/bluetooth-properties.desktop
@@ -118,6 +119,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Thu Sep 20 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-4
+- Only show and start the bluez-gnome bits in GNOME (#258721)
+
 * Tue Sep 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.14-3
 - Split out the analyzer so it's not installed by default
 - Don't prefix the properties .desktop with fedora for no reason