rpms/imsettings/devel .cvsignore, 1.11, 1.12 imsettings.spec, 1.23, 1.24 sources, 1.10, 1.11 imsettings-fix-registertriggerkeys.patch, 1.1, NONE imsettings-fix-unpredictable-session-order.patch, 1.1, NONE

[Akira TAGOH]

Author: tagoh

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

Modified Files:
	.cvsignore imsettings.spec sources 
Removed Files:
	imsettings-fix-registertriggerkeys.patch 
	imsettings-fix-unpredictable-session-order.patch 
Log Message:
* Mon Feb 23 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.0-1
- New upstream release.
  - Fix a parser error for Compose data. (#484142)
  - Allow a lowername or .conf name for IM name. (#471833)
  - Add Xfconf support. (#478669)
- Remove unnecessary autostart files anymore. (#475907)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	23 Oct 2008 13:24:26 -0000	1.11
+++ .cvsignore	23 Feb 2009 14:10:41 -0000	1.12
@@ -10,3 +10,4 @@
 imsettings-0.104.1.tar.bz2
 imsettings-0.105.0.tar.bz2
 imsettings-0.105.1.tar.bz2
+imsettings-0.106.0.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- imsettings.spec	28 Oct 2008 11:15:22 -0000	1.23
+++ imsettings.spec	23 Feb 2009 14:10:41 -0000	1.24
@@ -1,23 +1,19 @@
 Name:		imsettings
-Version:	0.105.1
-Release:	3%{?dist}
+Version:	0.106.0
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	intltool gettext
-BuildRequires:	libtool autoconf
 BuildRequires:	desktop-file-utils
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
 BuildRequires:	libgxim-devel >= 0.3.1, libnotify-devel
-BuildRequires:	xfce-mcs-manager-devel libxfce4mcs-devel
+BuildRequires:	xfconf-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	libX11-devel
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
 # workaround for KDE, it will be removed when we have a correct fix
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
-Patch1:		imsettings-fix-unpredictable-session-order.patch
-Patch2:		imsettings-fix-registertriggerkeys.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -70,6 +66,7 @@
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
 Requires:	im-chooser
+Requires:	xfce4-settings >= 4.5.99.1-2
 
 %description	xfce
 IMSettings is a framework that delivers Input Method
@@ -82,9 +79,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .0-lang
-%patch1 -p0 -b .1-session-order
-%patch2 -p0 -b .2-triggerkeys
-autoreconf
 
 %build
 %configure	\
@@ -115,10 +109,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/
 
-desktop-file-install						\
-	--delete-original					\
-	--dir=$RPM_BUILD_ROOT%{_datadir}/gnome/autostart	\
-	$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-imsettings-applet.desktop
+sed -i -e '/^Hidden=true$/d' $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+touch -r backends/xfce_xfconf/imsettings-xfce-helper.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
 #desktop-file-install						\
 #	--delete-original					\
 #	--dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart	\
@@ -164,14 +156,18 @@
 %files	-f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_bindir}/imsettings-*
-%{_bindir}/im-xsettings-daemon
+%{_bindir}/imsettings-applet
+%{_bindir}/imsettings-info
+%{_bindir}/imsettings-list
+%{_bindir}/imsettings-reload
+%{_bindir}/imsettings-restart
+%{_bindir}/imsettings-start
+%{_bindir}/imsettings-stop
+%{_bindir}/imsettings-xim
 %{_libexecdir}/gconf-im-settings-daemon
-%{_libexecdir}/im-info-daemon
 %{_libexecdir}/im-settings-daemon
 %{_libexecdir}/xinputinfo.sh
 %{_datadir}/dbus-1/services/*.service
-%{_datadir}/gnome/autostart/gnome-imsettings-applet.desktop
 %{_datadir}/pixmaps/*.png
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
@@ -184,7 +180,6 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/libimsettings.so.*
 %{_libdir}/libimsettings-xim.so.*
-%{_libdir}/libimsettings-xsettings.so.*
 
 %files	devel
 %defattr(-, root, root, -)
@@ -192,16 +187,23 @@
 %{_includedir}/imsettings
 %{_libdir}/libimsettings.so
 %{_libdir}/libimsettings-xim.so
-%{_libdir}/libimsettings-xsettings.so
 %{_libdir}/pkgconfig/imsettings.pc
 
 %files	xfce
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/mcs-plugins/imsettings_plugin.so 
+%{_bindir}/imsettings-xfce-helper
+%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
 
 
 %changelog
+* Mon Feb 23 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.0-1
+- New upstream release.
+  - Fix a parser error for Compose data. (#484142)
+  - Allow a lowername or .conf name for IM name. (#471833)
+  - Add Xfconf support. (#478669)
+- Remove unnecessary autostart files anymore. (#475907)
+
 * Tue Oct 28 2008 Akira TAGOH <tagoh at redhat.com> - 0.105.1-3
 - imsettings-fix-registertriggerkeys.patch: Fix to send
   XIM_REGISTER_TRIGGERKEYS anyway. (#468833)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	23 Oct 2008 13:24:26 -0000	1.10
+++ sources	23 Feb 2009 14:10:41 -0000	1.11
@@ -1 +1 @@
-f59b921f0fac514275246c673ae97c28  imsettings-0.105.1.tar.bz2
+ec96c8f421559fe8654e85830871fdb8  imsettings-0.106.0.tar.bz2


--- imsettings-fix-registertriggerkeys.patch DELETED ---


--- imsettings-fix-unpredictable-session-order.patch DELETED ---