rpms/imsettings/devel imsettings.spec, 1.49, 1.50 imsettings-fix-gconf-abort.patch, 1.1, NONE imsettings-fix-segfault-on-dbus.patch, 1.1, NONE imsettings-fix-segfault-on-non-bash.patch, 1.1, NONE imsettings-fix-segv-on-xfce-helper.patch, 1.1, NONE imsettings-missing-x11.patch, 1.1, NONE

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31544

Modified Files:
	imsettings.spec 
Removed Files:
	imsettings-fix-gconf-abort.patch 
	imsettings-fix-segfault-on-dbus.patch 
	imsettings-fix-segfault-on-non-bash.patch 
	imsettings-fix-segv-on-xfce-helper.patch 
	imsettings-missing-x11.patch 
Log Message:
* Tue Mar 23 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.0-1
- New upstream release.
- Fix the abort issue. (#570462)
- clean up the unnecessary patches.


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- imsettings.spec	16 Feb 2010 07:42:16 -0000	1.49
+++ imsettings.spec	23 Mar 2010 04:56:05 -0000	1.50
@@ -1,12 +1,11 @@
 Name:		imsettings
-Version:	0.107.4
-Release:	8%{?dist}
+Version:	0.108.0
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
 BuildRequires:	intltool gettext
-BuildRequires:	automake autoconf libtool
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
 BuildRequires:	libgxim-devel >= 0.3.1, libnotify-devel
 %if !0%{?rhel}
@@ -20,11 +19,6 @@ Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-none.conf-gtk-xim-default.patch
-Patch3:		imsettings-fix-segv-on-xfce-helper.patch
-Patch4:		imsettings-fix-segfault-on-dbus.patch
-Patch5:		imsettings-fix-gconf-abort.patch
-Patch6:		imsettings-missing-x11.patch
-Patch7:		imsettings-fix-segfault-on-non-bash.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -94,12 +88,6 @@ This package contains a plugin to get th
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xim
-%patch3 -p0 -b .3-xfce
-%patch4 -p0 -b .4-dbus
-%patch5 -p0 -b .5-gconf
-%patch6 -p0 -b .6-missing-x11
-%patch7 -p0 -b .7-nonbash
-autoreconf -f -i
 
 %build
 %configure	\
@@ -129,6 +117,8 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/imsettin
 # still not stable
 rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon
+rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/lxde-im-settings-daemon.service
+rm -f $RPM_BUILD_ROOT%{_libexecdir}/lxde-im-settings-daemon
 
 # workaround for KDE
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env
@@ -149,25 +139,28 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %pre
-if [ "$1" -gt 1 ]; then
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	if [ -f %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas ]; then
-		gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
-	fi
-fi
+%gconf_schema_prepare imsettings-applet
+#if [ "$1" -gt 1 ]; then
+#	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+#	if [ -f %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas ]; then
+#		gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
+#	fi
+#fi
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas > /dev/null || :
+%gconf_schema_upgrade imsettings-applet
+#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
+%gconf_schema_remove imsettings-applet
+#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
@@ -225,6 +218,11 @@ fi
 
 
 %changelog
+* Tue Mar 23 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.0-1
+- New upstream release.
+- Fix the abort issue. (#570462)
+- clean up the unnecessary patches.
+
 * Tue Feb 16 2010 Akira TAGOH <tagoh at redhat.com> - 0.107.4-8
 - Fix a segfault issue when /bin/sh points to non-bash shell. (#553680)
 


--- imsettings-fix-gconf-abort.patch DELETED ---


--- imsettings-fix-segfault-on-dbus.patch DELETED ---


--- imsettings-fix-segfault-on-non-bash.patch DELETED ---


--- imsettings-fix-segv-on-xfce-helper.patch DELETED ---


--- imsettings-missing-x11.patch DELETED ---