rpms/imsettings/devel .cvsignore, 1.8, 1.9 imsettings.spec, 1.11, 1.12 sources, 1.7, 1.8

[Akira TAGOH]

Author: tagoh

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

Modified Files:
	.cvsignore imsettings.spec sources 
Log Message:
* Thu Sep 25 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.1-1
- New upstream release.
  - Fix a segfault issue. (#462899)
  - Suppress the unnecessary notification. (#463797)
  - Add .schemas file missing. real fix of #460703.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	17 Sep 2008 14:52:36 -0000	1.8
+++ .cvsignore	25 Sep 2008 03:52:10 -0000	1.9
@@ -7,3 +7,4 @@
 imsettings-0.102.0.tar.bz2
 imsettings-0.103.0.tar.bz2
 imsettings-0.104.0.tar.bz2
+imsettings-0.104.1.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- imsettings.spec	17 Sep 2008 14:52:36 -0000	1.11
+++ imsettings.spec	25 Sep 2008 03:52:10 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		imsettings
-Version:	0.104.0
+Version:	0.104.1
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
@@ -18,7 +18,9 @@
 Group:		Applications/System
 Requires:	xorg-x11-xinit >= 1.0.2-22.fc8
 Requires:	imsettings-libs = %{version}-%{release}
-Requires(post):	/bin/dbus-send %{_sbindir}/alternatives
+Requires(pre):	GConf2
+Requires(post):	/bin/dbus-send %{_sbindir}/alternatives GConf2
+Requires(preun):	GConf2
 Requires(postun):	/bin/dbus-send %{_sbindir}/alternatives
 
 %description
@@ -80,7 +82,8 @@
 %build
 %configure	\
 	--with-xinputsh=50-xinput.sh \
-	--disable-static
+	--disable-static \
+	--disable-schemas-install
 
 make %{?_smp_mflags}
 
@@ -107,11 +110,25 @@
 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/imsettings-applet.schemas > /dev/null || :
+fi
+
 %post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10
 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30
 dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || :
 
+%preun
+if [ "$1" -eq 0 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
+fi
+
 %postun
 if [ "$1" = 0 ]; then
 	alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf
@@ -136,6 +153,7 @@
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
 %{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
+%{_sysconfdir}/gconf/schemas/imsettings-applet.schemas
 
 %files	libs
 %defattr(-, root, root, -)
@@ -160,6 +178,12 @@
 
 
 %changelog
+* Thu Sep 25 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.1-1
+- New upstream release.
+  - Fix a segfault issue. (#462899)
+  - Suppress the unnecessary notification. (#463797)
+  - Add .schemas file missing. real fix of #460703.
+
 * Wed Sep 17 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.0-1
 - New upstream release.
   - Fix deadkey issue under XIM. (#457901)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Sep 2008 14:52:36 -0000	1.7
+++ sources	25 Sep 2008 03:52:10 -0000	1.8
@@ -1 +1 @@
-9f4d176e3b87675b54863f7e042ff06c  imsettings-0.104.0.tar.bz2
+fbe4cf6e514809c4db8ef9283f1ab2d1  imsettings-0.104.1.tar.bz2