rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.31,1.32

[fedora-cvs-commits at redhat.com]

Author: harald

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

Modified Files:
	gnome-bluetooth.spec 
Log Message:
- install schemata correctly (bug #193518)



Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-bluetooth.spec	29 May 2006 12:16:29 -0000	1.31
+++ gnome-bluetooth.spec	30 May 2006 10:07:01 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -16,6 +16,9 @@
 BuildRequires: pygtk2-devel python-devel
 BuildRequires: intltool
 Requires: %{name}-libs = %{version}-%{release}
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 ExcludeArch: s390 s390x
 
 Patch1: gnome-bluetooth-0.7.0-pydir.patch
@@ -67,6 +70,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
 
@@ -79,10 +83,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 
@@ -108,6 +133,9 @@
 %{_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)