rpms/gnome-bluetooth/devel gnome-bluetooth.spec, 1.53, 1.54 gnome-bluetooth-0.8.0-desktop.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	gnome-bluetooth.spec 
Removed Files:
	gnome-bluetooth-0.8.0-desktop.patch 
Log Message:
* Wed Feb 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.0-3
- Remove gnome-obex-server, we should use gnome-user-share now



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-bluetooth.spec	11 Feb 2008 11:30:13 -0000	1.53
+++ gnome-bluetooth.spec	27 Feb 2008 13:39:36 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.11.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth
@@ -22,14 +22,8 @@
 Requires: bluez-utils
 ExcludeArch: s390 s390x
 
-Patch1: gnome-bluetooth-0.8.0-desktop.patch
-
 %description
-This package contains a Bonobo server to control Bluetooth devices,
-and a simple GUI to explore which devices are available
-(gnome-bluetooth-manager).  Also, an OBEX server is available,
-gnome-obex-server.  This will receive files sent via Bluetooth to your PC,
-and save them in your home directory.
+This package contains a library with widgets for Bluetooth applications.
 
 %package libs
 Summary: Libraries for applications, which use gnome-bluetooth
@@ -52,7 +46,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .dfix
 
 %build
 %configure
@@ -73,6 +66,9 @@
 	rmdir $RPM_BUILD_ROOT/usr/lib
 fi
 
+# Remove the gnome-obex-server
+rm -rf $RPM_BUILD_ROOT%{_bindir}/ $RPM_BUILD_ROOT%{_datadir}/applications/ $RPM_BUILD_ROOT%{_sysconfdir}/
+
 %find_lang %{name}
 
 %clean
@@ -81,35 +77,31 @@
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
+    if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
+      gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
+    fi
 fi
 
 %post libs -p /sbin/ldconfig
 
-%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
-
 %postun libs -p /sbin/ldconfig
 
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
+    if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
+      gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
+    fi
 fi
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 #GPLv2
 %doc AUTHORS COPYING ChangeLog NEWS README 
-%{_bindir}/gnome-obex-server
-%{_datadir}/applications/gnome-obex-server.desktop
 %{_datadir}/gnome-bluetooth/
 %{_datadir}/pixmaps/*
-%config(noreplace) %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas
 
 %files libs
 %defattr(-, root, root)
@@ -129,6 +121,9 @@
 %{_libdir}/libgnomebt.so
 
 %changelog
+* Wed Feb 27 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.0-3
+- Remove gnome-obex-server, we should use gnome-user-share now
+
 * Mon Feb 11 2008 - Ondrej Vasik <ovasik at redhat.com> - 0.11.0-1
 - gcc43 rebuild
 


--- gnome-bluetooth-0.8.0-desktop.patch DELETED ---