rpms/gnome-bluetooth/FC-5 gnome-bluetooth.spec,1.30,1.31

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/gnome-bluetooth/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24614/FC-5

Modified Files:
	gnome-bluetooth.spec 
Log Message:
- corrected BuildRoot
- smp flags added
- specfile cleanup
- fixed desktop file



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/FC-5/gnome-bluetooth.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-bluetooth.spec	27 Feb 2006 13:41:44 -0000	1.30
+++ gnome-bluetooth.spec	9 Mar 2007 15:46:15 -0000	1.31
@@ -1,11 +1,12 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 2
+Release: 2.FC5.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
-Source: http://usefulinc.com/software/gnome-bluetooth/releases/%{name}-%{version}.tar.bz2
+#Source: http://usefulinc.com/software/gnome-bluetooth/releases/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/gnome-bluetooth/0.7/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf >= 2.57 bluez-libs-devel >= 2.8 bluez-utils 
@@ -14,7 +15,12 @@
 BuildRequires: libbtctl-devel >= 0.6.0
 BuildRequires: gob2 openobex-devel >= 1.0.1
 BuildRequires: pygtk2-devel python-devel
+BuildRequires: intltool
 Requires: %{name}-libs = %{version}-%{release}
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires: bluez-utils
 ExcludeArch: s390 s390x
 
 Patch1: gnome-bluetooth-0.7.0-pydir.patch
@@ -23,7 +29,7 @@
 %description
 This package contains a Bonobo server to control Bluetooth devices,
 and a simple GUI to explore which devices are available
-(gnome-bluetooth-admin).  Also, an OBEX server is 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.
 
@@ -66,6 +72,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
 ./libtool --finish $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules
 
@@ -78,10 +85,31 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%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 || :
+    killall -HUP gconfd-2 || :
+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 || :
+    killall -HUP gconfd-2 || :
+fi
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README 
@@ -107,6 +135,12 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Tue May 30 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-5
+- install schemata correctly (bug #193518)
+
+* Mon May 29 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-3
+- more build requires (bug #193374)
+
 * Mon Feb 27 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-2
 - pydir fixes for lib64