rpms/imsettings/F-11 .cvsignore, 1.15, 1.16 imsettings.spec, 1.30, 1.31 sources, 1.14, 1.15

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23377

Modified Files:
	.cvsignore imsettings.spec sources 
Log Message:
* Tue Sep  1 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-1
- New upstream release.
  - Fix taking CPU load after switching IM.
  - Fix getting stuck after starting some IM.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	27 Aug 2009 08:20:43 -0000	1.15
+++ .cvsignore	1 Sep 2009 13:41:48 -0000	1.16
@@ -14,3 +14,4 @@ imsettings-0.106.0.tar.bz2
 imsettings-0.106.1.tar.bz2
 imsettings-0.106.2.tar.bz2
 imsettings-0.107.2.tar.bz2
+imsettings-0.107.3.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/imsettings.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- imsettings.spec	27 Aug 2009 08:20:43 -0000	1.30
+++ imsettings.spec	1 Sep 2009 13:41:48 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		imsettings
-Version:	0.107.2
+Version:	0.107.3
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
@@ -8,7 +8,9 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	intltool gettext
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
 BuildRequires:	libgxim-devel >= 0.3.1, libnotify-devel
+%if !0%{?rhel}
 BuildRequires:	xfconf-devel
+%endif
 BuildRequires:	GConf2-devel
 BuildRequires:	libX11-devel
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -63,6 +65,7 @@ or the desktop.
 This package contains the development files to make any
 applications with imsettings.
 
+%if !0%{?rhel}
 %package	xfce
 Summary:	Xfce support on imsettings
 Group:		Applications/System
@@ -77,6 +80,7 @@ immediately without any need to restart 
 or the desktop.
 
 This package contains a plugin to get this working on Xfce.  
+%endif
 
 %prep
 %setup -q
@@ -103,6 +107,10 @@ chmod 0755 $RPM_BUILD_ROOT%{_sysconfdir}
 # clean up the unnecessary files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la
+%if 0%{?rhel}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+rm -f $RPM_BUILD_ROOT%{_bindir}/imsettings-xfce-helper
+%endif
 
 # still not stable
 rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service
@@ -193,14 +201,24 @@ fi
 %{_libdir}/libimsettings-xim.so
 %{_libdir}/pkgconfig/imsettings.pc
 
+%if !0%{?rhel}
 %files	xfce
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/imsettings-xfce-helper
 %{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+%endif
 
 
 %changelog
+* Tue Sep  1 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.3-1
+- New upstream release.
+  - Fix taking CPU load after switching IM.
+  - Fix getting stuck after starting some IM.
+
+* Mon Aug 31 2009 Akira TAGOH <tagoh at redhat.com>
+- Add a conditional build to disable xfce module for RHEL.
+
 * Thu Aug 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.2-1
 - New upstream release.
   - Stop IM process properly with the DBus disconnect signal. (#518970)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	27 Aug 2009 08:20:43 -0000	1.14
+++ sources	1 Sep 2009 13:41:48 -0000	1.15
@@ -1,2 +1 @@
-d7f713a1b0d621aae7f5cc4b72f08c6e  imsettings-0.106.2.tar.bz2
-3451c2bc4f82e63afb7c827e4a2f8dbf  imsettings-0.107.2.tar.bz2
+c6201e25cbd670d0784bd998e80b5684  imsettings-0.107.3.tar.bz2