[imsettings] New upstream release.

[Akira TAGOH]

commit 75ac8aa2e6be3ff0a3c40428bc0044333d64c802
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Nov 22 18:23:39 2012 +0900

    New upstream release.
    
      - MATE 1.5 support

 imsettings-no-autostart-for-gnome-shell.patch |   22 ----------
 imsettings.spec                               |   55 ++++++++++++-------------
 sources                                       |    2 +-
 3 files changed, 28 insertions(+), 51 deletions(-)
---
diff --git a/imsettings.spec b/imsettings.spec
index e9fb88c..0f7055f 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,9 +1,8 @@
 Name:		imsettings
-Version:	1.4.0
-Release:	2%{?dist}
+Version:	1.5.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:	libtool automake autoconf
@@ -12,13 +11,14 @@ BuildRequires:	libnotify-devel
 BuildRequires:	libX11-devel, libgxim-devel >= 0.3.1
 %if !0%{?rhel}
 BuildRequires:	xfconf-devel
-BuildRequires:	mate-conf-devel
 %endif
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
-Patch0:		imsettings-constraint-of-language.patch
-Patch1:		imsettings-disable-xim.patch
-Patch2:		imsettings-xinput-xcompose.patch
-Patch3:		imsettings-no-autostart-for-gnome-shell.patch
+## Fedora specific: run IM for certain languages only
+Patch0:		%{name}-constraint-of-language.patch
+## Fedora specific: Disable XIM support
+Patch1:		%{name}-disable-xim.patch
+## Fedora specific: Enable xcompose for certain languages
+Patch2:		%{name}-xinput-xcompose.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -82,7 +82,7 @@ This package contains a module to get this working with XIM.
 Summary:	GNOME support on imsettings
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
-Requires:	im-chooser dconf
+Requires:	dconf
 Provides:	imsettings-desktop-module = %{version}-%{release}
 
 %description	gnome
@@ -115,7 +115,7 @@ applications.
 Summary:	Xfce support on imsettings
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
-Requires:	im-chooser
+Requires:	im-chooser-xfce
 Requires:	xfce4-settings >= 4.5.99.1-2
 Provides:	imsettings-desktop-module = %{version}-%{release}
 
@@ -135,6 +135,7 @@ Requires:	lxde-settings-daemon
 # Hack for upgrades: see https://bugzilla.redhat.com/show_bug.cgi?id=693809
 Requires:	lxsession
 Requires:	/usr/bin/lxsession
+Requires:	im-chooser
 Provides:	imsettings-desktop-module = %{version}-%{release}
 
 %description	lxde
@@ -149,8 +150,10 @@ This package contains a module to get this working on LXDE.
 Summary:	MATE support on imsettings
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
-Requires:	mate-settings-daemon
+# need to keep more deps for similar reason to https://bugzilla.redhat.com/show_bug.cgi?id=693809
+Requires:	mate-settings-daemon >= 1.5.0
 Requires:	mate-session-manager
+Requires:	im-chooser
 Provides:	imsettings-desktop-module = %{version}-%{release}
 
 %description	mate
@@ -167,7 +170,6 @@ This package contains a module to get this working on MATE.
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xcompose
-%patch3 -p1 -b .3-no-autostart-for-gnome-shell
 
 %build
 %configure	\
@@ -179,8 +181,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p"
 
 # change the file attributes
 chmod 0755 $RPM_BUILD_ROOT%{_libexecdir}/xinputinfo.sh
@@ -190,14 +191,17 @@ chmod 0755 $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/imsettings/*.la
 %if 0%{?rhel}
-rm -f $RPM_BUILD_ROOT%{_libdir}/imsettings/libimsettings-{lxde,xfce}.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/imsettings/libimsettings-{lxde,xfce,mate-gsettings}.so
 %endif
 
+desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-start.desktop
+
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
+#%%check
+## Disable it because it requires DBus session
+# make check
 
 %post
 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10
@@ -217,14 +221,13 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %files	-f %{name}.lang
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %dir %{_libdir}/imsettings
-%{_bindir}/imsettings-check
 %{_bindir}/imsettings-info
 %{_bindir}/imsettings-list
 %{_bindir}/imsettings-reload
 %{_bindir}/imsettings-switch
+%{_libexecdir}/imsettings-check
 %{_libexecdir}/imsettings-daemon
 %{_libexecdir}/xinputinfo.sh
 %{_datadir}/dbus-1/services/*.service
@@ -234,12 +237,10 @@ fi
 %{_sysconfdir}/xdg/autostart/imsettings-start.desktop
 
 %files	libs
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/libimsettings.so.*
 
 %files	devel
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_includedir}/imsettings
 %{_libdir}/libimsettings.so
@@ -249,40 +250,38 @@ fi
 %{_datadir}/gtk-doc/html/imsettings
 
 %files	xim
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/imsettings-xim
 %{_libdir}/imsettings/libimsettings-xim.so
 
 %files	gnome
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/imsettings/libimsettings-gsettings.so
 
 %files	qt
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/imsettings/libimsettings-qt.so
 
 %if !0%{?rhel}
 %files	xfce
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/imsettings/libimsettings-xfce.so
 
 %files	lxde
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/imsettings/libimsettings-lxde.so
 
 %files	mate
-%defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/imsettings/libimsettings-mateconf.so
+%{_libdir}/imsettings/libimsettings-mate-gsettings.so
 %endif
 
 
 %changelog
+* Thu Nov 22 2012 Akira TAGOH <tagoh at redhat.com> - 1.5.0-1
+- New upstream release.
+  - MATE 1.5 support
+
 * Mon Oct 22 2012 Akira TAGOH <tagoh at redhat.com> - 1.4.0-2
 - No autostart on gnome-shell. (#868458)
 
diff --git a/sources b/sources
index ee181c1..9bf1044 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb2e37056afe2f4be4b843a6b31f5bd1  imsettings-1.4.0.tar.bz2
+31db79221b3b2a64ed9a07dc96abd540  imsettings-1.5.0.tar.bz2